From 776e6001fd00793e0f177d56428490b00b42d35c Mon Sep 17 00:00:00 2001 From: Sanjar Ahmadov Date: Fri, 26 Feb 2021 09:42:15 -0500 Subject: [PATCH] Update styles --- src/main/jflex/chocopy/pa1/ChocoPy.jflex | 94 +++++++++++++----------- 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/src/main/jflex/chocopy/pa1/ChocoPy.jflex b/src/main/jflex/chocopy/pa1/ChocoPy.jflex index c297fab..cbfb668 100644 --- a/src/main/jflex/chocopy/pa1/ChocoPy.jflex +++ b/src/main/jflex/chocopy/pa1/ChocoPy.jflex @@ -180,30 +180,32 @@ if True: } } } + + { /* Delimiters. */ - {LineBreak} { yybegin(YYINITIAL); currIndent = 0;indentErrorUnchecked = true; return symbol(ChocoPyTokens.NEWLINE);} - ":" { return symbol(ChocoPyTokens.COLON); } - "," { return symbol(ChocoPyTokens.COMMA); } + {LineBreak} { yybegin(YYINITIAL); currIndent = 0;indentErrorUnchecked = true; return symbol(ChocoPyTokens.NEWLINE);} + ":" { return symbol(ChocoPyTokens.COLON); } + "," { return symbol(ChocoPyTokens.COMMA); } /* Literals. */ - {IntegerLiteral} { return symbol(ChocoPyTokens.NUMBER, + {IntegerLiteral} { return symbol(ChocoPyTokens.NUMBER, Integer.parseInt(yytext())); } - "\"" {yybegin(STR); str_l = yyline + 1; str_c = yycolumn + 1; currString = "";} //Start taking a string when see a " + "\"" { yybegin(STR); str_l = yyline + 1; str_c = yycolumn + 1; currString = ""; } //Start taking a string when see a " "False" { return symbol(ChocoPyTokens.BOOL, false); } "True" { return symbol(ChocoPyTokens.BOOL, true); } "None" { return symbol(ChocoPyTokens.NONE); } /*Keywords*/ - "if" {return symbol(ChocoPyTokens.IF);} - "else" {return symbol(ChocoPyTokens.ELSE);} - "elif" {return symbol(ChocoPyTokens.ELIF);} - "while" {return symbol(ChocoPyTokens.WHILE);} - "class" {return symbol(ChocoPyTokens.CLASS);} - "def" {return symbol(ChocoPyTokens.DEF);} - "lambda" {return symbol(ChocoPyTokens.LAMBDA);} + "if" { return symbol(ChocoPyTokens.IF); } + "else" { return symbol(ChocoPyTokens.ELSE); } + "elif" { return symbol(ChocoPyTokens.ELIF); } + "while" { return symbol(ChocoPyTokens.WHILE); } + "class" { return symbol(ChocoPyTokens.CLASS); } + "def" { return symbol(ChocoPyTokens.DEF); } + "lambda" { return symbol(ChocoPyTokens.LAMBDA); } "as" { return symbol(ChocoPyTokens.AS); } "for" { return symbol(ChocoPyTokens.FOR); } "global" { return symbol(ChocoPyTokens.GLOBAL); } @@ -227,47 +229,51 @@ if True: /* Operators. */ - "+" { return symbol(ChocoPyTokens.PLUS); } - "-" { return symbol(ChocoPyTokens.MINUS); } - "*" { return symbol(ChocoPyTokens.MUL); } - "//" { return symbol(ChocoPyTokens.DIV); } - "/" { return symbol(ChocoPyTokens.DIV); } //Accroding to manual, chocopy don't have fp division, '/', '//' should be integr division - "%" { return symbol(ChocoPyTokens.MOD); } - ">" { return symbol(ChocoPyTokens.GT); } - "<" { return symbol(ChocoPyTokens.LT); } - "==" { return symbol(ChocoPyTokens.EQUAL); } - "!=" { return symbol(ChocoPyTokens.NEQ); } - ">=" { return symbol(ChocoPyTokens.GEQ); } - "<=" { return symbol(ChocoPyTokens.LEQ); } - "=" { return symbol(ChocoPyTokens.ASSIGN); } - "and" { return symbol(ChocoPyTokens.AND); } - "or" { return symbol(ChocoPyTokens.OR); } - "not" { return symbol(ChocoPyTokens.NOT); } - "." { return symbol(ChocoPyTokens.DOT); } - "(" { return symbol(ChocoPyTokens.LPAR); } - ")" { return symbol(ChocoPyTokens.RPAR); } - "[" { return symbol(ChocoPyTokens.LBR); } - "]" { return symbol(ChocoPyTokens.RBR); } + "+" { return symbol(ChocoPyTokens.PLUS); } + "-" { return symbol(ChocoPyTokens.MINUS); } + "*" { return symbol(ChocoPyTokens.MUL); } + "//" { return symbol(ChocoPyTokens.DIV); } + "/" { return symbol(ChocoPyTokens.DIV); } //Accroding to manual, chocopy don't have fp division, '/', '//' should be integr division + "%" { return symbol(ChocoPyTokens.MOD); } + ">" { return symbol(ChocoPyTokens.GT); } + "<" { return symbol(ChocoPyTokens.LT); } + "==" { return symbol(ChocoPyTokens.EQUAL); } + "!=" { return symbol(ChocoPyTokens.NEQ); } + ">=" { return symbol(ChocoPyTokens.GEQ); } + "<=" { return symbol(ChocoPyTokens.LEQ); } + "=" { return symbol(ChocoPyTokens.ASSIGN); } + "and" { return symbol(ChocoPyTokens.AND); } + "or" { return symbol(ChocoPyTokens.OR); } + "not" { return symbol(ChocoPyTokens.NOT); } + "." { return symbol(ChocoPyTokens.DOT); } + "(" { return symbol(ChocoPyTokens.LPAR); } + ")" { return symbol(ChocoPyTokens.RPAR); } + "[" { return symbol(ChocoPyTokens.LBR); } + "]" { return symbol(ChocoPyTokens.RBR); } "->" { return symbol(ChocoPyTokens.ARROW); } "is" { return symbol(ChocoPyTokens.IS); } /*Identifiers*/ - {Identifiers} {return symbol(ChocoPyTokens.ID, yytext());} + {Identifiers} { return symbol(ChocoPyTokens.ID, yytext()); } + /* Whitespace. */ - {WhiteSpace} { /* ignore */ } + {WhiteSpace} { /* ignore */ } + /* Comment. */ - {Comments} { /* ignore */ } + {Comments} { /* ignore */ } } { - {StringLiteral} {currString += yytext();} - \\$ { /*'\' at the end of line, do nothing.*/ } - "\"" {yybegin(AFTER); return symbolFactory.newSymbol(ChocoPyTokens.terminalNames[ChocoPyTokens.STRING], ChocoPyTokens.STRING, - new ComplexSymbolFactory.Location(str_l, str_c), - new ComplexSymbolFactory.Location(yyline + 1,yycolumn + yylength()), - currString);} // accepted a ", return to AFTER state + {StringLiteral} { currString += yytext(); } + + \\$ { /*'\' at the end of line, do nothing.*/ } + + "\"" { yybegin(AFTER); return symbolFactory.newSymbol(ChocoPyTokens.terminalNames[ChocoPyTokens.STRING], ChocoPyTokens.STRING, + new ComplexSymbolFactory.Location(str_l, str_c), + new ComplexSymbolFactory.Location(yyline + 1,yycolumn + yylength()), + currString); } // accepted a ", return to AFTER state } -<> { if(!stack.isEmpty()){ return symbol(ChocoPyTokens.DEDENT, pop());} return symbol(ChocoPyTokens.EOF);} +<> { if(!stack.isEmpty()){ return symbol(ChocoPyTokens.DEDENT, pop());} return symbol(ChocoPyTokens.EOF); } /* Error fallback. */ -[^] { return symbol(ChocoPyTokens.UNRECOGNIZED); } +[^] { return symbol(ChocoPyTokens.UNRECOGNIZED); }