Changeset 3787

Timestamp:

May 29, 2008, 3:09:30 PM (13 years ago)

Author:

orlov

Message:

• Check first all declarations and then function definitions.
• Check new-built AST once (not twice) for syntax and occurences highlighting.
• Test for $iter.

Location:

devel-tools/trunk/eclipse

Files:

• org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/ExprChecker.java (modified) (1 diff)
• org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/FormatCheckerTest.java (modified) (1 diff)
• org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpReconcilingStrategy.java (modified) (2 diffs)

devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/ExprChecker.java

@@ -197 +197 @@
             astUse.accept(this);
         for (AstTopNode astTopNode : astImplem.topNodeList)
-            astTopNode.accept(this);
+            if (!(astTopNode instanceof AstFuncDef))
+                astTopNode.accept(this);
+        for (AstTopNode astTopNode : astImplem.topNodeList)
+            if (astTopNode instanceof AstFuncDef)
+                astTopNode.accept(this);
     }
 

devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/FormatCheckerTest.java

@@ -83 +83 @@
         expectMessage("$func F A = B; F { { { B; }; A; } = B; };", MsgCode.WrongFormatOfPatternExpression);
         expectMessage("$func F A = B; F { { { A = A; }; A = B; }; };", MsgCode.WrongFormatOfFunctionResult);
+        
+        expectMessage("$func F =; F ,A $iter /*empty*/ :: sX;", MsgCode.FormatMismatch);
     }
 

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpReconcilingStrategy.java

@@ -32 +32 @@
     }
 
-    public AstImplem getAstImplem () {
+    public synchronized AstImplem getAstImplem () {
         if (!isRelevant)
             updateAstImplem();
@@ -39 +39 @@
 
     public void reconcile (IRegion partition) {
-        updateAstImplem();
+        getAstImplem();
         if (astImplem != null)
             editor.changeTextPresentation(document, PresentationVisitor.updateTextPresentation(astImplem));