Operator revamped, Affectation and EmptyNode classes created

Bonus: makefile use simplified

Author: flodavid

color_schemes/vscode/ezlanguage/README.md color_schemes/vscode/README.mdcolor_schemes/vscode/ezlanguage/README.md renamed to color_schemes/vscode/README.md

@@ -92,13 +92,13 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\+\=|-\=|\*\=|/\=|//\=|%\=|&amp;\=|\|\=|\^\=|&gt;&gt;\=|&lt;&lt;\=|\*\*\=|@\=</string>
+			<string>\+\=|-\=|\*\=|/\=|%\=|&amp;\=|\|\=|\^\=|&gt;&gt;\=|&lt;&lt;\=|\*\*\=|@\=</string>
 			<key>name</key>
 			<string>keyword.operator.assignment.augmented.ezlanguage</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\+|\-|\*|\*\*|/|//|%|&lt;&lt;|&gt;&gt;|&amp;|\||\^|~|(?!^)@</string>
+			<string>\+|\-|\*|\*\*|/|%|&lt;&lt;|&gt;&gt;|&amp;|\||\^|~|(?!^)@</string>
 			<key>name</key>
 			<string>keyword.operator.arithmetic.ezlanguage</string>
 		</dict>
@@ -471,7 +471,7 @@
 			<key>match</key>
 			<string>(?x) \b(
 						elif | else | then | for | if | return | while | when | begin | end | do | step |
-						program |
+						program | is | in | of | or |
 						(yield(?:\s+from)?)
 					)\b
 					</string>
@@ -1301,7 +1301,7 @@
 		<key>builtin_types</key>
 		<dict>
 			<key>comment</key>
-			<string>These are from https://docs.ezlanguage.org/X/library/stdtypes.html
+			<string>These are from https://docs.python.org/X/library/stdtypes.html
       	  				where X is 2.7 or 3.5.</string>
 			<key>match</key>
 			<string>(?x)

color_schemes/vscode/ezlanguage/syntaxes/EZLanguage.tmLanguage

@@ -1,46 +1,45 @@
-#compiler used
+# Compiler used
 CC = g++-5
-# compilation flags
+# Compilation flags
 CC_FLAGS = -Wall -std=c++11 -ggdb
 EXT_SRC = 
 CC_MOD_FLAGS = -MM #-MP 
 
-# lex file extensions (.XXX)
+# Lex file extensions (.XXX)
 LEX_EXT = lex
-# lex file interpreter : lexical analysis
+# Lex file interpreter : lexical analysis
 LEX = flex
 LEX_FlAGS =
 
-
-# extension des fichiers yacc (.XXX)
+# Yacc files extension (.XXX)
 YACC_EXT = ypp
 # interpréteur des fichiers Yacc : analyse syntaxique et sémantique
 YACC = bison -t
 YACC_FLAGS =
 
+
 # cpp sources
 # --- RAJOUTER CHAQUE FICHIER CPP DE MODULES ICI ! ---
 # --- FAIRE UN FICHIER CPP POUR CHAQUE FICHIER H S'IL Y A UNE CLASSE DEDANS ---
 
 # Core
-MOD_CPP = src/modules/Node.cpp src/modules/Program.cpp src/modules/TranslatedNode.cpp
+MOD_CPP = Node.cpp Program.cpp TranslatedNode.cpp EmptyNode.cpp
 # Conditional expression
-MOD_CPP += src/modules/Expression.cpp src/modules/BooleanExpression.cpp src/modules/BooleanValue.cpp src/modules/ConditionalExpression.cpp
+MOD_CPP += Expression.cpp BooleanExpression.cpp BooleanValue.cpp ConditionalExpression.cpp
 # Divers
-MOD_CPP += src/modules/ArrayAccess.cpp
+MOD_CPP += ArrayAccess.cpp Affectation.cpp Operator.cpp
 
 # Instructions
-INSTR_CPP = src/instructions/If.cpp src/instructions/Else.cpp src/instructions/Operation.cpp
-INSTR_CPP += src/instructions/For.cpp src/instructions/Repeat.cpp src/instructions/While.cpp
-INSTR_CPP += src/instructions/Return.cpp
+INSTR_CPP = If.cpp Else.cpp
+INSTR_CPP += For.cpp Repeat.cpp While.cpp
+INSTR_CPP += Return.cpp
 
-ADDONS_CPP = src/addons/String_addon.cpp src/addons/log.cpp
+# Declarations
+DEC_CPP = CommonDeclaration.cpp
+DEC_CPP += Container.cpp Function.cpp Procedure.cpp Class.cpp Variable.cpp MultipleVariable.cpp Parameter.cpp
 
-# declarations
-DEC_CPP = src/declarations/CommonDeclaration.cpp
-DEC_CPP += src/declarations/Container.cpp src/declarations/Function.cpp src/declarations/Procedure.cpp
-DEC_CPP += src/declarations/Class.cpp src/declarations/Variable.cpp src/declarations/MultipleVariable.cpp
-DEC_CPP += src/declarations/Parameter.cpp
+# Addons
+ADDONS_CPP = src/addons/String_addon.cpp src/addons/log.cpp
 
 # hash table sources
 HT_CPP = src/hash_table/HashElement.cpp src/hash_table/HashTable.cpp src/hash_table/ScopeHashTable.cpp src/hash_table/ClassHashTable.cpp
@@ -49,19 +48,19 @@ HT_CPP += src/hash_table/ClassHashed.cpp src/hash_table/FunctionHashed.cpp src/h
 
 ALL_CPP = ${MOD_CPP} ${DEC_CPP} ${INSTR_CPP} ${ADDONS_CPP} ${HT_CPP}
 
-#object files
-MOD_OBJ = $(MOD_CPP:src/modules/%.cpp=obj/%.o)
-DEC_OBJ = $(DEC_CPP:src/declarations/%.cpp=obj/%.o)
-INSTR_OBJ = $(INSTR_CPP:src/instructions/%.cpp=obj/%.o)
+# Object files
+MOD_OBJ = $(MOD_CPP:%.cpp=obj/%.o)
+DEC_OBJ = $(DEC_CPP:%.cpp=obj/%.o)
+INSTR_OBJ = $(INSTR_CPP:%.cpp=obj/%.o)
 ADDONS_OBJ = $(ADDONS_CPP:src/addons/%.cpp=obj/%.o)
 HT_OBJ = $(HT_CPP:src/hash_table/%.cpp=obj/%.o)
 
 ALL_OBJ = ${MOD_OBJ} ${DEC_OBJ} ${INSTR_OBJ} ${ADDONS_OBJ} ${HT_OBJ}
 
-#dependency files
+# Dependency files
 ALL_DPDCY = $(ALL_OBJ:%.o=%.d)
 
-#executables
+# Executables
 # exe name, must have the same name as lex file
 EXEC = EZ_language_compiler
 

makefile

@@ -39,8 +39,8 @@ minus     [-]
 
 {separators}   	{ /* On ignore */ }
 {comment}   	{ /* Ignore it */ cout << "Comment"<<endl; }
-{integer}		{ yylval.texte= yytext; return(NUM_INTEGER); }  // integer
-{reel}      	{ yylval.texte= yytext; return(NUM_REAL);}	// real
+{integer}		{ yylval.text= yytext; return(NUM_INTEGER); }  // integer
+{reel}      	{ yylval.text= yytext; return(NUM_REAL);}	// real
 
 {backLine}	return(BACK_LINE);
 
@@ -195,12 +195,12 @@ minus     [-]
 (exist|EXIST)      				return(EXIST);
 
 
-{ID}	{	yylval.texte= yytext;
+{ID}	{	yylval.text= yytext;
 	    		return (NAME);
 	}
 
-{quote}{minus}{minus}{ID}{quote}  {yylval.texte = yytext; return(STRING_PARAM);}
-{quote}{phrase}{quote}  {yylval.texte = yytext; return(STRING);}
+{quote}{minus}{minus}{ID}{quote}  {yylval.text = yytext; return(STRING_PARAM);}
+{quote}{phrase}{quote}  {yylval.text = yytext; return(STRING);}
 
 
 <<EOF>>     return END_OF_FILE;