diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-10 18:40:20 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-10 18:40:20 +0100 |
| commit | 7dd82c1674132e0c6ea9f81bed9b142f8d4fbd7e (patch) | |
| tree | c53c988a40486f4758f34fa76e011d21894cdcab /asm/asmlex.mll | |
| parent | 7a2e8c69cb4a4407261f11dd36374273d1fc5a28 (diff) | |
| parent | cc00abd9e33a00d3c7acfe310bf8d6522e9a1888 (diff) | |
| download | SystDigit-Projet-7dd82c1674132e0c6ea9f81bed9b142f8d4fbd7e.tar.gz SystDigit-Projet-7dd82c1674132e0c6ea9f81bed9b142f8d4fbd7e.zip | |
Merge branch 'emile'
Conflicts:
asm/asmpars.mly
Diffstat (limited to 'asm/asmlex.mll')
| -rw-r--r-- | asm/asmlex.mll | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/asm/asmlex.mll b/asm/asmlex.mll index 1f598e9..b2c7718 100644 --- a/asm/asmlex.mll +++ b/asm/asmlex.mll @@ -86,7 +86,7 @@ rule token = parse | '#' { comment lexbuf } | ['\t' '\r' ' '] { token lexbuf } | ':' { COLON } - | '\n' { Lexing.new_line lexbuf; token lexbuf } + | '\n' { Lexing.new_line lexbuf; NLB } | ((['a'-'z'] | '_') (alpha | digit | '_')*) as id { try ROP (List.assoc id keywords_r) with Not_found -> try RIOP (List.assoc id keywords_ri) @@ -108,7 +108,6 @@ rule token = parse | '(' { LP } | ')' { RP } | '"' { str [] lexbuf } - |';' { SEMIC } and str acc = parse | "\\\\" { str ('\\' :: acc) lexbuf } |