merged changes from the svn fork by me and Enrico

[helm.git] / helm / ocaml / cic_disambiguation / cicTextualLexer2.ml

diff --git a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
index 6f179505d749c8782e7a83b2ff58edc1bde3b964..650b6972375f76c5c49885cfd51efdb05a3b8a5b 100644 (file)
--- a/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
+++ b/helm/ocaml/cic_disambiguation/cicTextualLexer2.ml
@@ -106,6 +106,9 @@ let rec token' = lexer
 
 and token = lexer
 *)
+
+let remove_quotes s = String.sub s 1 (String.length s - 2)
+
 let rec token comments = lexer
   | blanks -> token comments lexbuf
   | uri -> return lexbuf ("URI", Ulexing.utf8_lexeme lexbuf)
@@ -119,9 +122,7 @@ let rec token comments = lexer
   | meta -> return lexbuf ("META", Ulexing.utf8_lexeme lexbuf)
   | implicit -> return lexbuf ("IMPLICIT", Ulexing.utf8_lexeme lexbuf)
   | qstring ->
-      let lexeme = Ulexing.utf8_lexeme lexbuf in
-      let s = String.sub lexeme 1 (String.length lexeme - 2) in
-      return lexbuf ("QSTRING", s)
+      return lexbuf ("QSTRING", remove_quotes (Ulexing.utf8_lexeme lexbuf))
   | symbol -> return lexbuf ("SYMBOL", Ulexing.utf8_lexeme lexbuf)
   | tex_token ->
       let macro =