Merge pull request #166 from tetsuo-jp/master

BNFC · Sep 7, 2016 · d633673 · d633673
2 parents fafa3af + 4b3b789
commit d633673
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/source/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs b/source/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
@@ -193,16 +193,17 @@ rules cf = mkRule "token" $
     ++
     [ (mkRegexMultilineComment b e, "token lexbuf") | (b,e) <- multilineC]
     ++
+    -- reserved keywords
+    [ ( "rsyms"
+      , "let id = lexeme lexbuf in try Hashtbl.find symbol_table id with Not_found -> failwith (\"internal lexer error: reserved symbol \" ^ id ^ \" not found in hashtable\")" )
+      | not (null (cfgSymbols cf))]
+    ++
     -- user tokens
     [ (text n , tokenAction (text t)) | (n,_,t) <- userTokens cf]
     ++
     -- predefined tokens
     [ ( "l i*", tokenAction "Ident" ) ]
     ++
-    [ ( "rsyms"
-      , "let id = lexeme lexbuf in try Hashtbl.find symbol_table id with Not_found -> failwith (\"internal lexer error: reserved symbol \" ^ id ^ \" not found in hashtable\")" )
-      | not (null (cfgSymbols cf))]
-    ++
     -- integers
     [ ( "d+", "let i = lexeme lexbuf in TOK_Integer (int_of_string i)" )
     -- doubles