Remplissage de la table des procédures dans Logo.g.

Vérification qu'une variable locale ne surcharge pas un paramètre de procédure. git-svn-id: http://ladystorm.bigmadarea.net/svn/nf11@39 1e871849-ca45-4617-b4d0-c39c463a1ac7
jersub · Jun 1, 2010 · 6c87f3f · 6c87f3f
1 parent 459bdd6
commit 6c87f3f
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 23 deletions.
diff --git a/src/logogui/LogoFrame.java b/src/logogui/LogoFrame.java
@@ -296,7 +296,7 @@ private void runParser() {
 				   // tree walker
 				   CommonTreeNodeStream nodes = new CommonTreeNodeStream(parseTree);
 				   LogoTree treewalker = new LogoTree(nodes);
-				   treewalker.initialize(getJLogoPane().getGraphics());
+				   treewalker.initialize(getJLogoPane().getGraphics(), parser.getProcedures());
 				   treewalker.prog();
 			   } 
 		} catch(Exception ex) {

diff --git a/src/logoparsing/Logo.g b/src/logoparsing/Logo.g
@@ -48,15 +48,25 @@ tokens {
 @header {
 	package logoparsing;
 	import java.util.TreeSet;
+	import java.util.TreeMap;
 	import logogui.Log;
 }
 @members {
 	boolean valide = true;
+	Procedure currentProcedure;
 	public boolean getValide(){
 		return valide;
 	}
+	public TreeMap<String,Procedure> getProcedures(){
+		return procedures;
+	}
+	private Procedure createProcedure(String procedureName) {
+		Procedure p = new Procedure(procedureName);
+		procedures.put(procedureName, p);
+		return p;
+	}
 	TreeSet<String> vars = new TreeSet<String>();
-	TreeSet<String> procedures = new TreeSet<String>();
+	TreeMap<String,Procedure> procedures = new TreeMap<String,Procedure>();
 }
 INT	:	('0'..'9')+;
 VRAI	:	'VRAI'|'vrai';
@@ -76,7 +86,15 @@ instruction
 	|	REPETE^ expr bloc
 	|	TANTQUE^ exprBool bloc
 	|	SI^ exprBool bloc bloc?
-	|	LOCALE^ a = id_ecriture {vars.add($a.s);}
+	|	LOCALE^ a = id_ecriture
+		{
+			if (currentProcedure.hasVar($a.s)) {
+				valide = false;
+				Log.appendnl("La variable "+$a.s+" est deja define en tant que parametre de la procedure "+currentProcedure.getName()+".");
+			} else {
+				vars.add($a.s);
+			}
+		}
 	|	DONNE^ a = id_ecriture expr {vars.add($a.s);}
 	|	( AV^ |	TD^ | TG^ | REC^ | FCAP^ ) expr
 	|	FPOS^ '['! expr expr ']'!
@@ -127,9 +145,26 @@ ecris	:	ECRIS^ (chaine|expr)
 	|	ECRIS id_lecture -> ^(ECRIS_VAR id_lecture)
 	;
 procedure
-	:	POUR a = ID (':' b = ID {vars.add($b.getText());})* {procedures.add($a.getText());} liste_instructions FIN -> ^(POUR ID ID* ^(BLOC liste_instructions))
-	;
-exec	:	a = ID^ { if (!procedures.contains($a.getText())) {valide = false; Log.appendnl("La procedure "+$a.getText()+" n'a pas ete declaree.");}}
+@after {
+	currentProcedure = null;
+}
+	:	POUR a = ID {currentProcedure = createProcedure($a.getText());}
+		(':' b = ID
+		{
+			String varName = $b.getText();
+			currentProcedure.addVar(varName);
+			vars.add(varName);
+		}
+		)* liste_instructions FIN
+		-> ^(POUR ID ID* ^(BLOC liste_instructions))
+	;
+exec	:	a = ID^
+		{
+			if (!procedures.containsKey($a.getText())) {
+				valide = false;
+				Log.appendnl("La procedure "+$a.getText()+" n'a pas ete declaree.");
+			}
+		}
 		((expr | id_lecture | chaine))*
 	;
 ret	:	RET^ (expr|chaine)

diff --git a/src/logoparsing/LogoTree.g b/src/logoparsing/LogoTree.g
@@ -8,21 +8,21 @@ options {
 	import logogui.Traceur;
 	import logogui.Log;
 	import java.util.HashMap;
-	import java.util.TreeMap;
+	import java.util.Map;
 }
 @members {
 	Traceur traceur;
 	int level = 0;
 	int compteur;
-	String procedureName;
+	Procedure currentProcedure;
 	String lastReturnValue;
 	HashMap<String,String> globalVars = new HashMap<String,String>();
-	TreeMap<String,Integer> procedures = new TreeMap<String,Integer>();
-	TreeMap<String,VarProcedureStorer> procedureVars = new TreeMap<String,VarProcedureStorer>();
+	Map<String,Procedure> procedures;
 
-	public void initialize(java.awt.Graphics g) {
+	public void initialize(java.awt.Graphics g, Map<String,Procedure> procedures) {
 		traceur = Traceur.getInstance();
 		traceur.setGraphics(g);
+		this.procedures = procedures;
 	}
 	public void push(int index) {
 		((CommonTreeNodeStream)input).push(index);
@@ -58,13 +58,12 @@ scope {
 	$bloc::var = new HashMap<String,String>();
 	level++;
 
-	if (procedureName != null) {
-		VarProcedureStorer s = procedureVars.get(procedureName);
-		for (String varName : s.getVarNames()) {
-			$bloc::var.put(varName, s.getValue(varName));
+	if (currentProcedure != null) {
+		for (String varName : currentProcedure.getVarNames()) {
+			$bloc::var.put(varName, currentProcedure.getValue(varName));
 		}
 
-		procedureName = null;
+		currentProcedure = null;
 	}
 }
 @after {
@@ -177,19 +176,19 @@ procedure
 @init {
 	int mark_list = 0;
 }
-  	:	^(POUR a = ID {procedureName = $a.getText(); procedureVars.put(procedureName, new VarProcedureStorer());} arg_dec* {mark_list = input.mark();} . ) {procedures.put($a.getText(), mark_list);}
+  	:	^(POUR a = ID arg_dec* {mark_list = input.mark();} . ) {procedures.get($a.getText()).setIndex(mark_list);}
 	;
-arg_dec	:	a = ID {procedureVars.get(procedureName).addVar($a.getText());}
+arg_dec	:	a = ID 
 	;
 exec returns [String r]
 @init {
 	compteur = 1;
 	int mark_list = 0;
 }
-	:	^(a = ID {procedureName = $a.getText();} arg_exec* {mark_list = input.mark();})
+	:	^(a = ID {currentProcedure = procedures.get($a.getText());} arg_exec* {mark_list = input.mark();})
 		{
 			push(mark_list);
-			push(procedures.get($a.getText()));
+			push(currentProcedure.getIndex());
 			bloc();
 			if (lastReturnValue == null) {
 				pop();
@@ -201,8 +200,8 @@ exec returns [String r]
 			pop();
 		}
 	;
-arg_exec:	x = expr {procedureVars.get(procedureName).initVar(compteur++, String.valueOf($x.v));}
-	|	s = chaine {procedureVars.get(procedureName).initVar(compteur++, $s.s);}
+arg_exec:	x = expr {currentProcedure.initVar(compteur++, String.valueOf($x.v));}
+	|	s = chaine {currentProcedure.initVar(compteur++, $s.s);}
 	;
 ret	:	^(RET
 		(	x = expr {lastReturnValue = String.valueOf($x.v);}

diff --git a/src/logoparsing/VarProcedureStorer.java b/src/logoparsing/VarProcedureStorer.java
@@ -2,11 +2,17 @@
 
 import java.util.HashMap;
 
-class VarProcedureStorer {
+class Procedure {
 
     private final HashMap<String,Integer> varNameMap = new HashMap<String,Integer>();
     private final HashMap<Integer,String> indexMap = new HashMap<Integer,String>();
     private int argCounter = 1;
+    private final String name;
+    private int index;
+
+    public Procedure(String name) {
+        this.name = name;
+    }
 
     public void addVar(String varName) {
         String value = "---";
@@ -29,4 +35,20 @@ public String getValue(String name) {
     public Iterable<String> getVarNames() {
         return varNameMap.keySet();
     }
+
+    public boolean hasVar(String varName) {
+        return varNameMap.containsKey(varName);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
 }