Commit 556482c6 authored by stolpmann's avatar stolpmann

Updated PXP lexer code to SVN version of PXP.

Note: This is a temporary solution, not for release!


git-svn-id: https://godirepo.camlcity.org/svn/wdialog/trunk@190 f54c9a64-0731-4a92-b797-30fd5898f27c
parent 267608c6
......@@ -21,7 +21,7 @@
* </>
*)
(* $Id: wd_templrep.ml,v 3.4 2002-10-20 19:39:17 stolpmann Exp $
(* $Id: wd_templrep.ml,v 3.5 2004-08-01 18:31:35 stolpmann Exp $
* ----------------------------------------------------------------------
*
*)
......@@ -145,10 +145,16 @@ let parse_expr_oe enc s =
* return value: a pair of the scanned [expr] and a string list containing
* the scanned output encodings
*)
let lfactory = Pxp_lexers.get_lexer_factory enc in
let lobj = lfactory # open_string s in
let scan = lobj # scan_name_string in
let buf = () in
(*
-- up to pxp 1.1.94:
let lset = Pxp_lexers.get_lexer_set enc in
let scan = lset.Pxp_lexer_types.scan_name_string in
let buf = Lexing.from_string s in
*)
let nmtoken =
function
Pxp_lexer_types.Name s -> s
......@@ -668,7 +674,11 @@ let instantiate ?(eval_expr = fun _ -> assert false) r params container =
* History:
*
* $Log: wd_templrep.ml,v $
* Revision 3.4 2002-10-20 19:39:17 stolpmann
* Revision 3.5 2004-08-01 18:31:35 stolpmann
* Updated PXP lexer code to SVN version of PXP.
* Note: This is a temporary solution, not for release!
*
* Revision 3.4 2002/10/20 19:39:17 stolpmann
* New feature: The brackets $[...] can contain expressions,
* not only variables
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment