bill/ChocoPy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged with master and resolved conflicts

Browse Source
This commit is contained in:
Sanjar Ahmadov
2021-02-26 08:46:48 -05:00
parent 9f6d969d2d 42628a34f7
commit 7688ac7a8d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/cup/chocopy/pa1/ChocoPy.cup
+1 -1
View File
@@ -259,7 +259,7 @@ non terminal VarDef var_def;
non terminal ClassDef class_def; non terminal ClassDef class_def;
non terminal FuncDef fun_def; non terminal FuncDef fun_def;
non terminal Literal literal; non terminal Literal literal;
non terminal StringLiteral bin_op, comp_op; non terminal StringLiteral bin_op, comp_op;
non terminal TypedVar typed_var; non terminal TypedVar typed_var;
non terminal TypeAnnotation type, ret_type; non terminal TypeAnnotation type, ret_type;
non terminal Identifier identifier; non terminal Identifier identifier;
src/main/jflex/chocopy/pa1/ChocoPy.jflex
+3
View File
@@ -2,6 +2,7 @@ package chocopy.pa1;
import java_cup.runtime.*; import java_cup.runtime.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
%% %%
/*** Do not change the flags below unless you know what you are doing. ***/ /*** Do not change the flags below unless you know what you are doing. ***/
@@ -81,6 +82,7 @@ import java.util.Iterator;
WhiteSpace = [ \t] WhiteSpace = [ \t]
LineBreak = \r|\n|\r\n LineBreak = \r|\n|\r\n
IntegerLiteral = 0|[1-9][0-9]* // Accroding to the manual, 00+ is illeagal IntegerLiteral = 0|[1-9][0-9]* // Accroding to the manual, 00+ is illeagal
StringLiteral = ([^\"\\]|(\\\")|(\\t)|(\\r)|(\\n)|(\\\\))+ // \n, \r, \t, \\, \" and Anything except \ and " StringLiteral = ([^\"\\]|(\\\")|(\\t)|(\\r)|(\\n)|(\\\\))+ // \n, \r, \t, \\, \" and Anything except \ and "
Identifiers = (_|[a-z]|[A-Z])(_|[a-z]|[A-Z]|[0-9])* Identifiers = (_|[a-z]|[A-Z])(_|[a-z]|[A-Z]|[0-9])*
@@ -188,6 +190,7 @@ if True:
/* Literals. */ /* Literals. */
{IntegerLiteral} { return symbol(ChocoPyTokens.NUMBER, {IntegerLiteral} { return symbol(ChocoPyTokens.NUMBER,
Integer.parseInt(yytext())); } 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); } "False" { return symbol(ChocoPyTokens.BOOL, false); }
"True" { return symbol(ChocoPyTokens.BOOL, true); } "True" { return symbol(ChocoPyTokens.BOOL, true); }