scriptcomp: add initializers to for, while, switch statements; add in…

…crementers to for statements

This change add the ability to use initialization and arbitrary
statements within for, while and switch statements.  Any variables
defined or initialized within a for, while or switch statement will be
scoped within the associated compound statement and any child scopes.

add

add comment back

neverwinter/nwscript/compiler.nim

@@ -53,6 +53,7 @@ const
   OptimizationFlagsO2* = fullSet(OptimizationFlag)
 
 const CompileErrorTlk* = {
+  559: "ERROR: CONDITIONAL EXPRESSION MISSING",
   560: "ERROR: UNEXPECTED CHARACTER",
   561: "ERROR: FATAL COMPILER ERROR",
   562: "ERROR: PROGRAM COMPOUND STATEMENT AT START",

neverwinter/nwscript/native/scriptcomp.h

@@ -655,6 +655,8 @@ class CScriptCompiler
 	int32_t         DetermineLocationOfCode();
 	int32_t         ResolveLabels();
 	int32_t         WriteResolvedOutput();
+	//int32_t		    CloseVariableScope(int32_t nStackPointer);
+	void		    CloseVariableScope();
 
 	int32_t         m_nFinalBinarySize;
 

neverwinter/nwscript/native/scriptcompcore.cpp

@@ -1917,6 +1917,7 @@ const char *GrammarToString(int nGrammar)
 		case CSCRIPTCOMPILER_GRAMMAR_POST_EXPRESSION:                   return "POST_EXPRESSION";
 		case CSCRIPTCOMPILER_GRAMMAR_PRIMARY_EXPRESSION:                return "PRIMARY_EXPRESSION";
 		case CSCRIPTCOMPILER_GRAMMAR_CONSTANT:                          return "CONSTANT";
+		case CSCRIPTCOMPILER_GRAMMAR_WITHIN_STATEMENT_GROUP:            return "WITHIN_STATEMENT_GROUP";
 	}
 	return "(unknown grammar)";
 }

neverwinter/nwscript/native/scriptcompfinalcode.cpp

@@ -2357,8 +2357,6 @@ int32_t CScriptCompiler::InVisitGenerateCode(CScriptParseTreeNode *pNode)
 			}
 
 		}
-
-
 	}
 
 	if (pNode->nOperation == CSCRIPTCOMPILER_OPERATION_COND_CHOICE)
@@ -3485,6 +3483,7 @@ int32_t CScriptCompiler::PostVisitGenerateCode(CScriptParseTreeNode *pNode)
 	{
 		// Handled in the InVisit call, so we don't need to do anything
 		// here to handle this case.
+
 		return 0;
 	}
 
@@ -3497,11 +3496,17 @@ int32_t CScriptCompiler::PostVisitGenerateCode(CScriptParseTreeNode *pNode)
 
 	if (pNode->nOperation == CSCRIPTCOMPILER_OPERATION_COMPOUND_STATEMENT)
 	{
-
 		// We keep track of all of the variables added at this recursion level, and
 		// peel them off one by one.  This is actually done within the script itself
 		// as well, since we need to keep track of what's happening.  However, we
 		// don't need to worry about the address of a variable.
+
+		// Experiement - gatekeeping at a point other than this node.
+		if (pNode->nIntegerData4 == -1)
+		{
+			return 0;
+		}
+
 
 		int32_t nStackAtStart = m_nStackCurrentDepth;