[Avida-SVN] r2006 - development/source/script

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-08-24 15:59:24 -0400 (Fri, 24 Aug 2007)
New Revision: 2006

Modified:
   development/source/script/cParser.cc
   development/source/script/cParser.h
Log:
AS: Audit and comment todo items in cParser.

Modified: development/source/script/cParser.cc
===================================================================
--- development/source/script/cParser.cc	2007-08-24 19:50:46 UTC (rev 2005)
+++ development/source/script/cParser.cc	2007-08-24 19:59:24 UTC (rev 2006)
@@ -763,9 +763,7 @@
   
   nextToken();
   tAutoRelease<cASTNode> cond(parseExpression());
-  
   if (currentToken() != TOKEN(PREC_CLOSE)) PARSE_UNEXPECT();
-
   nextToken();
   
   tAutoRelease<cASTIfBlock> is(new cASTIfBlock(cond.Release(), parseCodeBlock()));
@@ -773,16 +771,14 @@
   while (currentToken() == TOKEN(CMD_ELSEIF)) {
     
     if (nextToken() != TOKEN(PREC_OPEN)) PARSE_UNEXPECT();
-    
     nextToken(); // consume '('
+    
     tAutoRelease<cASTNode> elifcond(parseExpression());
     
     if (currentToken() != TOKEN(PREC_CLOSE)) PARSE_UNEXPECT();
-
     nextToken(); // consume ')'
     
     cASTNode* elifcode = parseCodeBlock();
-    
     (*is).AddElseIf(elifcond.Release(), elifcode);
   }
   
@@ -802,7 +798,6 @@
   tAutoRelease<cASTNode> sl(parseStatementList());
   
   if (currentToken() != TOKEN(ARR_CLOSE)) PARSE_UNEXPECT();
-
   nextToken(); // consume '}'
 
   return sl.Release();
@@ -826,7 +821,7 @@
 {
   PARSE_TRACE("parseReturnStatement");
   
-  nextToken();
+  nextToken(); // consume 'return'
   cASTNode* rs = new cASTReturnStatement(parseExpression());
   
   return rs;
@@ -951,7 +946,8 @@
 {
   PARSE_TRACE("parseVarDeclareList");
   cASTNode* vl = NULL;
-  
+ 
+  // @todo - var decleare list
   parseVarDeclare();
   while (currentToken() == TOKEN(COMMA)) {
     parseVarDeclare();
@@ -968,13 +964,10 @@
   
   nextToken();
   tAutoRelease<cASTNode> cond(parseExpression());
-  
   if (currentToken() != TOKEN(PREC_CLOSE)) PARSE_UNEXPECT();
-
   nextToken();
   
   cASTNode* code = parseCodeBlock();
-  
   return new cASTWhileBlock(cond.Release(), code);
 }
 

Modified: development/source/script/cParser.h
===================================================================
--- development/source/script/cParser.h	2007-08-24 19:50:46 UTC (rev 2005)
+++ development/source/script/cParser.h	2007-08-24 19:59:24 UTC (rev 2006)
@@ -117,8 +117,6 @@
   cASTNode* parseVarDeclareList();
   cASTNode* parseWhileStatement();
   
-  bool checkLineTerm(cASTNode* node);
-  
   void reportError(ASParseError_t err, const int line);
 };