diff --git a/compiler/2014/LabCommScanner.flex b/compiler/2014/LabCommScanner.flex index 0b28eff715d85d27ea31a99a2c52957165e2a0c2..d60a4379a0dd55f72ee96286803beb9c8e45d32d 100644 --- a/compiler/2014/LabCommScanner.flex +++ b/compiler/2014/LabCommScanner.flex @@ -6,13 +6,13 @@ import se.lth.control.labcomm2014.compiler.LabCommParser.Terminals; %% -%public -%final +%public +%final %class LabCommScanner %extends Scanner -%type Symbol -%function nextToken +%type Symbol +%function nextToken %yylexthrow Scanner.Exception %unicode @@ -47,12 +47,12 @@ EndOfLineComment = "//" {InputCharacter}* {LineTerminator}? Identifier = [[:letter:]_]([[:letter:]_[:digit:]])* StringLiteral = [:jletterdigit:]* -DecimalNumeral = 0 | {NonZeroDigit} {Digits}? +DecimalNumeral = 0 | {NonZeroDigit} {Digits}? Digits = {Digit}+ Digit = 0 | {NonZeroDigit} NonZeroDigit = [1-9] -QuotedString = "\"" {InputCharacter}* "\"" +QuotedString = "\""~"\"" %% @@ -84,7 +84,7 @@ QuotedString = "\"" {InputCharacter}* "\"" ";" { return sym(Terminals.SEMICOLON); } ":" { return sym(Terminals.COLON); } "," { return sym(Terminals.COMMA); } - + {Identifier} { return sym(Terminals.IDENTIFIER); } {QuotedString} { return sym(Terminals.QUOTEDSTRING); } }