added temp diag class UML

HadrienCazes · May 7, 2020 · 19cbeb3 · 19cbeb3
1 parent 3085237
commit 19cbeb3
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/diagrammeClasseTemporaire.pdf b/diagrammeClasseTemporaire.pdf
diff --git a/parser/expressionsFactory.py b/parser/expressionsFactory.py
@@ -1,6 +1,6 @@
-import "../tokenizer/constants" as constTokens
-import "./constants") as constParser
-import "./helper" as helper
+from tokenizer import constants as constTokens
+from parser import constants as constParser
+from parser import helper as helper
 
 def create(tokenType,tokens,start):
     if tokenType == constParser.expressionMethodCall:

diff --git a/parser/helper.py b/parser/helper.py
@@ -1,5 +1,5 @@
-import "../tokenizer/constants" as constTokens
-import "./constants" as constParser
+from tokenizer import constants as constTokens
+from parser import constants as constParser
 
 def searchString(tokens, start):
     string=[]

diff --git a/parser/parser.py b/parser/parser.py
@@ -1,6 +1,6 @@
-import "../tokenizer/constants" as constTokens
-import "./constants" as constParser
-import "./expressionsFactory" as factory
+from tokenizer import constants as constTokens
+from parser import constants as constParser
+from parser import expressionsFactory as factory
 
 def parser(tokens):
     AST=[]

diff --git a/tokenizer/__pycache__/constants.cpython-38.pyc b/tokenizer/__pycache__/constants.cpython-38.pyc
diff --git a/tokenizer/__pycache__/tokenizer.cpython-38.pyc b/tokenizer/__pycache__/tokenizer.cpython-38.pyc
diff --git a/tokenizer/constants.py b/tokenizer/constants.py
@@ -14,5 +14,6 @@
     "divide":  {"regRule": "/", "value":"/"},
     "modulo":  {"regRule": "%", "value":"%"},
     "printFunction":  {"regRule": "print", "value":"print"},
+    "defFunction" : {"regRule": "def", "value":"def"},
     "#":  {"regRule": "#", "value":"#"}
 }
diff --git a/tokenizer/tokenizer.py b/tokenizer/tokenizer.py
@@ -19,7 +19,7 @@ def tokenizer():
 	new_source = helper.replaceSpecialsChars(source)
 	token_list = []
 	new_source2 = re.split("[\t\f\v ]+", new_source)
-	print(new_source2)
+	#print(new_source2)
 	for word in new_source2:
 		if not word.isdigit():
 		#if len(word)<=0 or word==None: