compiler/libec2: fix _whilte vs _while typo. fix whitespace issues. fix camelCase...

diff --git a/compiler/libec2/parser.ec b/compiler/libec2/parser.ec
index eaf56dc..bdece19 100644 (file)
--- a/compiler/libec2/parser.ec
+++ b/compiler/libec2/parser.ec
@@ -31,7 +31,7 @@ class Form1 : Window
                ASTExpression exp = ASTExpression::parse();
                exp.print();
                PrintLn("");
-               PrintLn(exp.Compute());
+               PrintLn(exp.compute());
             }
             */
             delete f;

diff --git a/compiler/libec2/src/expressions.ec b/compiler/libec2/src/expressions.ec
index 98c52c5..2173850 100644 (file)
--- a/compiler/libec2/src/expressions.ec
+++ b/compiler/libec2/src/expressions.ec
@@ -87,7 +87,7 @@ public class ASTExpression : ASTNode
 public:
    ExpressionType type;
 
-   virtual float Compute();
+   virtual float compute();
 
    bool debugValue;
 
@@ -287,7 +287,7 @@ public class ExpConstant : ASTExpression
       return { constant = CopyString(readToken().text); };
    }
 
-   float Compute()
+   float compute()
    {
       return (float)atof(constant);
    }
@@ -343,24 +343,24 @@ public class ExpOperation : ASTExpression
       return exp;
    }
 
-   float Compute()
+   float compute()
    {
       if(exp1 && exp2)
       {
          switch(op)
          {
-            case '*': return exp1.Compute() * exp2.Compute();
-            case '/': return exp1.Compute() / exp2.Compute();
-            case '-': return exp1.Compute() - exp2.Compute();
-            case '+': return exp1.Compute() + exp2.Compute();
+            case '*': return exp1.compute() * exp2.compute();
+            case '/': return exp1.compute() / exp2.compute();
+            case '-': return exp1.compute() - exp2.compute();
+            case '+': return exp1.compute() + exp2.compute();
          }
       }
       else if(exp2)
       {
          switch(op)
          {
-            case '-': return -exp2.Compute();
-            case '+': return  exp2.Compute();
+            case '-': return -exp2.compute();
+            case '+': return  exp2.compute();
          }
       }
       return 0;
@@ -390,9 +390,9 @@ public:
       Print(")");
    }
 
-   float Compute()
+   float compute()
    {
-      return (list && list.lastIterator.data) ? list.lastIterator.data.Compute() : 0;
+      return (list && list.lastIterator.data) ? list.lastIterator.data.compute() : 0;
    }
 }
 

diff --git a/compiler/libec2/src/externals.ec b/compiler/libec2/src/externals.ec
index 9c3e950..8eeb93a 100644 (file)
--- a/compiler/libec2/src/externals.ec
+++ b/compiler/libec2/src/externals.ec
@@ -162,7 +162,7 @@ public ASTDeclarator GetFuncDecl(ASTDeclarator decl)
 
 public class AST : ASTList<ASTNode>
 {
-   ASTNode ::ParseExternalDeclaration()
+   ASTNode ::parseExternalDeclaration()
    {
       SpecsList specs = null;
       InitDeclList decls = null;
@@ -216,7 +216,7 @@ public:
       AST ast = null;
       while(peekToken())
       {
-         ASTNode n = ParseExternalDeclaration();
+         ASTNode n = parseExternalDeclaration();
          if(n)
          {
             if(!ast) ast = { };

diff --git a/compiler/libec2/src/lexing.ec b/compiler/libec2/src/lexing.ec
index b2d12d1..720ad23 100644 (file)
--- a/compiler/libec2/src/lexing.ec
+++ b/compiler/libec2/src/lexing.ec
@@ -39,7 +39,7 @@ public enum TokenType2 : TokenType
    {
       get
       {
-         return this == '='|| this == mulAssign || this == divAssign || this == modAssign ||
+        return this == '='|| this == mulAssign || this == divAssign || this == modAssign ||
                this == addAssign || this == subAssign || this == leftAssign || this == rightAssign ||
                this == andAssign || this == xorAssign || this == orAssign;
       }
@@ -94,16 +94,16 @@ public enum TokenType2 : TokenType
             case neOp: Print("!="); break;
             case andOp: Print("&&"); break;
             case orOp: Print("||"); break;
-          case mulAssign: Print("*="); break;
-          case divAssign: Print("/="); break;
-          case modAssign: Print("%="); break;
-          case addAssign: Print("+="); break;
-          case subAssign: Print("-="); break;
-          case leftAssign: Print("<<="); break;
-          case rightAssign: Print(">>="); break;
-          case andAssign: Print("&="); break;
-          case xorAssign: Print("^="); break;
-          case orAssign: Print("|="); break;
+            case mulAssign: Print("*="); break;
+            case divAssign: Print("/="); break;
+            case modAssign: Print("%="); break;
+            case addAssign: Print("+="); break;
+            case subAssign: Print("-="); break;
+            case leftAssign: Print("<<="); break;
+            case rightAssign: Print(">>="); break;
+            case andAssign: Print("&="); break;
+            case xorAssign: Print("^="); break;
+            case orAssign: Print("|="); break;
          }
       }
    }