Now const/enums have local scope. Also checking for double global declarations on the same compilation unit.

samples/test-local-constants.nut

@@ -0,0 +1,25 @@
+function localF(){
+	const fryday = 5;
+	enum E {a, b};
+	print(fryday, E.a, E.b);
+	//fryday = 6;
+	//print(fryday);
+}
+//print(fryday);
+localF();
+enum E {a=1.2, b=2.5};
+print(E.b);
+
+/*
+//local 
+enum Enum {dad, red, blue};
+
+const car = 3;
+
+local function localFunc(){
+	const mar = 999;
+	print(mar, Enum.blue);
+} 
+
+localFunc();
+*/

squirrel/sqcompiler.cpp

@@ -35,7 +35,8 @@ struct SQScope {
 #define BEGIN_SCOPE() SQScope __oldscope__ = _scope; \
 					 ++_scope.nested; \
 					 _scope.outers = _fs->_outers; \
-					 _scope.stacksize = _fs->GetStackSize();
+					 _scope.stacksize = _fs->GetStackSize();\
+					 _scope_consts.push_back(SQTable::Create(_ss(_vm),0));
 
 #define RESOLVE_OUTERS() if(_fs->GetStackSize() != _scope.stacksize) { \
 							if(_fs->CountOuters(_scope.stacksize)) { \
@@ -46,7 +47,8 @@ struct SQScope {
 #define END_SCOPE_NO_CLOSE() {	if(_fs->GetStackSize() != _scope.stacksize) { \
 							_fs->SetStackSize(_scope.stacksize); \
 						} \
-						_scope = __oldscope__; \
+						_scope = __oldscope__; \
+						_scope_consts.pop_back();\
 					}
 
 #define END_SCOPE() {	SQInteger oldouters = _fs->_outers;\
@@ -81,8 +83,8 @@ public:
 		_scope.outers = 0;
 		_scope.stacksize = 0;
 		_scope.nested = 0;
-		compilererror = NULL;
-	}
+		compilererror = NULL;
+	}
 	static void ThrowError(void *ud, const SQChar *s) {
 		SQCompiler *c = (SQCompiler *)ud;
 		c->Error(s);
@@ -103,6 +105,34 @@ public:
 		va_start(vl, s);
 		scvfprintf(stderr, s, vl);
 		va_end(vl);
+	}
+	bool IsConstant(const SQObject &name,SQObject &e){
+        SQObjectPtr val;
+	    for(int i=_scope.nested-1; i >= 0; --i){
+	        if(_table(_scope_consts[i])->Get(name,val)) {
+	            e = val;
+	            return true;
+	        }
+	    }
+        if(_table(_ss(_vm)->_consts)->Get(name,val)) {
+            e = val;
+            return true;
+        }
+        return false;
+	}
+	bool ConstsExists(const SQObjectPtr &key){
+        if(_scope.nested && _table(_scope_consts[_scope.nested-1])->Exists(key)) return true;
+        return _table(_ss(_vm)->_consts)->Exists(key);
+	}
+	bool ConstsGet(const SQObjectPtr &key,SQObjectPtr &val){
+	    for(int i=_scope.nested-1; i >= 0; --i){
+	        if(_table(_scope_consts[i])->Get(key,val)) return true;
+	    }
+	    return _table(_ss(_vm)->_consts)->Get(key,val);
+	}
+	bool ConstsNewSlot(const SQObjectPtr &key, const SQObjectPtr &val){
+	    if(_scope.nested) return _table(_scope_consts[_scope.nested-1])->NewSlot(key,val);
+	    return _table(_ss(_vm)->_consts)->NewSlot(key,val);
 	}
 	void Lex(){	_token = _lex.Lex();}
 	SQObjectPtr GetTokenObject(SQInteger tok)
@@ -335,15 +365,14 @@ public:
 			Lex();
 			SQObject id = Expect(TK_IDENTIFIER);
 			Expect('=');
-			SQTable *enums = _table(_ss(_vm)->_consts);
 			SQObjectPtr strongid = id;
-			if(enums->Exists(strongid)) {
+			if(ConstsExists(strongid)) {
 			    strongid.Null();
 			    Error(_SC("constant '%s' already exists"), _stringval(id));
 			}
 			SQObject val = ExpectScalar();
 			OptionalSemicolon();
-			enums->NewSlot(strongid,SQObjectPtr(val));
+			ConstsNewSlot(strongid,SQObjectPtr(val));
 			strongid.Null();
 
 			}
@@ -802,7 +831,7 @@ public:
 					}
 				}
 
-				else if(_fs->IsConstant(id, constant)) {
+				else if(IsConstant(id, constant)) {
 					/* Handle named constant */
 					SQObjectPtr constval;
 					SQObject    constid;
@@ -1483,9 +1512,8 @@ if(color == "yellow"){
 		Expect(_SC('{'));
 
         //checkLocalNameScope(id, _scope.nested);
-		SQTable *enums = _table(_ss(_vm)->_consts);
 		SQObjectPtr strongid = id;
-		if(enums->Exists(strongid)) {
+		if(ConstsExists(strongid)) {
 		    strongid.Null();
 		    Error(_SC("constant '%s' already exists"), _stringval(id));
 		}
@@ -1511,7 +1539,7 @@ if(color == "yellow"){
 			if(_token == ',') Lex();
 		}
 
-		enums->NewSlot(SQObjectPtr(strongid),SQObjectPtr(table));
+		ConstsNewSlot(SQObjectPtr(strongid),SQObjectPtr(table));
 		strongid.Null();
 		Lex();
 	}
@@ -1715,7 +1743,8 @@ private:
 	SQScope _scope;
 	SQChar *compilererror;
 	jmp_buf _errorjmp;
-	SQVM *_vm;
+	SQVM *_vm;
+	SQObjectPtrVec _scope_consts;
 };
 
 bool Compile(SQVM *vm,SQLEXREADFUNC rg, SQUserPointer up, const SQChar *sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo)

squirrel/sqfuncstate.cpp

@@ -275,16 +275,6 @@ void SQFuncState::SetStackSize(SQInteger n)
 	}
 }
 
-bool SQFuncState::IsConstant(const SQObject &name,SQObject &e)
-{
-	SQObjectPtr val;
-	if(_table(_sharedstate->_consts)->Get(name,val)) {
-		e = val;
-		return true;
-	}
-	return false;
-}
-
 bool SQFuncState::IsLocal(SQUnsignedInteger stkpos)
 {
 	if(stkpos>=_vlocals.size())return false;

squirrel/sqfuncstate.h

@@ -49,7 +49,6 @@ struct SQFuncState
 	bool IsLocal(SQUnsignedInteger stkpos);
 	SQObject CreateString(const SQChar *s,SQInteger len = -1);
 	SQObject CreateTable();
-	bool IsConstant(const SQObject &name,SQObject &e);
 	SQInteger _returnexp;
 	SQLocalVarInfoVec _vlocals;
 	SQIntVec _targetstack;