Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The precedence of reserved symbols and predefined tokens was different in Haskell and OCaml versions. #166

Merged
merged 1 commit into from
Sep 7, 2016
Merged

The precedence of reserved symbols and predefined tokens was different in Haskell and OCaml versions. #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions source/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down