compiler/libec: (#307, #70) Warning on undeclared class; Overriding namespaces

[sdk] / compiler / libec / src / dbpass.ec

diff --git a/compiler/libec/src/dbpass.ec b/compiler/libec/src/dbpass.ec
index 530f6fb..b38b9a8 100644 (file)
--- a/compiler/libec/src/dbpass.ec
+++ b/compiler/libec/src/dbpass.ec
@@ -34,7 +34,7 @@ static void ProcessSpecifier(Specifier spec)
                      MemberInit init;
                      for(init = def.defProperties->first; init; init = init.next)
                      {
-                        Class oldThisClass = thisClass;
+                        //Class oldThisClass = thisClass;
                         ProcessMemberInit(init);
                      }
                      break;
@@ -209,7 +209,7 @@ static void ProcessExpression(Expression exp)
          if(tableStatements)
          {
             Statement databaseOpenStmt = MkCompoundStmt(MkList(), MkList());
-            Statement compound, compound2;
+            Statement compound/*, compound2*/;
             Statement ifDBStmt;
             OldList * args;
             char numIndexesString[16];
@@ -220,8 +220,8 @@ static void ProcessExpression(Expression exp)
                MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("db")), null))));
 
             // bool createNow = false;
-            databaseOpenStmt.compound.declarations->Add(MkDeclaration(MkListOne(MkSpecifierName("bool")),
-               MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("createNow")), MkInitializerAssignment(MkExpIdentifier(MkIdentifier("false")))))));
+            /*databaseOpenStmt.compound.declarations->Add(MkDeclaration(MkListOne(MkSpecifierName("bool")),
+               MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("createNow")), MkInitializerAssignment(MkExpIdentifier(MkIdentifier("false")))))));*/
 
             // static bool initialized = false;
             args = MkList();
@@ -259,8 +259,8 @@ static void ProcessExpression(Expression exp)
             args->Add(MkExpIdentifier(MkIdentifier("create")));
             compound.compound.statements->Add(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier("db")), '=',
                MkExpCall(MkExpMember(exp.dbopen.ds, MkIdentifier("OpenDatabase")), args)))));
-            compound.compound.statements->Add(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier("createNow")), '=',
-               MkExpIdentifier(MkIdentifier("true"))))));
+            /*compound.compound.statements->Add(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier("createNow")), '=',
+               MkExpIdentifier(MkIdentifier("true")))));*/
 
             exp.dbopen.name = null;
             exp.dbopen.ds = null;
@@ -699,8 +699,6 @@ static void ProcessClass(ClassDefinition _class)
    }
 }
 
-static int curSymbolID = 0;
-
 static void ProcessDBTable(DBTableDef table)
 {
    OldList * rowClassDefs = MkList(), * idClassDefs = null;
@@ -712,7 +710,6 @@ static void ProcessDBTable(DBTableDef table)
    char nameField[1024];
    OldList * args;
    OldList * members;
-   int symbolID = curSymbolID; //MAXINT; //globalContext.nextID++;
    if(table.symbol)
       idClassDefs = MkList();
 
@@ -763,13 +760,12 @@ static void ProcessDBTable(DBTableDef table)
       inheritanceSpecs->Add(MkSpecifier(PRIVATE));
       inheritanceSpecs->Add(MkSpecifierName("Row"));
       PushContext();
-      _class = MkClass(DeclClass(globalContext.nextID++, rowClassName), inheritanceSpecs, rowClassDefs);
+      _class = MkClass(DeclClass(null, rowClassName), inheritanceSpecs, rowClassDefs);
       PopContext(curContext);
 
       def = MkClassDefDefaultProperty(MkListOne(MkMemberInitExp(MkExpIdentifier(MkIdentifier("tbl")), MkInitializerAssignment(MkExpIdentifier(MkIdentifier(tableID))))));
       rowClassDefs->Add(def);
 
-       _class.symbol.idCode = symbolID;
       _class.declMode = table.declMode;
       external = MkExternalClass(_class);
       ast->Insert(addAfter, external);
@@ -825,7 +821,6 @@ static void ProcessDBTable(DBTableDef table)
                      def = MkClassDefProperty(MkProperty(
                         CopyList(entry.dataType.qualifiers, CopySpecifier), CopyDeclarator(entry.dataType.declarator),
                            MkIdentifier(name), rowSet, null));
-                     def.propertyDef.symbol.id = def.propertyDef.symbol.idCode = symbolID;
                      def.propertyDef.isDBProp = true;
                      def.memberAccess = publicAccess;
                      rowClassDefs->Add(def);
@@ -881,7 +876,6 @@ static void ProcessDBTable(DBTableDef table)
 
                   curContext = globalContext;
                   def = MkClassDefProperty(MkProperty(CopyList(entry.dataType.qualifiers, CopySpecifier), entry.dataType.declarator, CopyIdentifier(entry.id), rowSet, rowGet));
-                  def.propertyDef.symbol.id = def.propertyDef.symbol.idCode = symbolID;
                   def.propertyDef.isDBProp = true;
                   def.memberAccess = publicAccess;
                   rowClassDefs->Add(def);
@@ -948,7 +942,6 @@ static void ProcessDBTable(DBTableDef table)
       ClassDef def;
       Expression exp;
 
-      // table.symbol.id = table.symbol.idCode = globalContext.nextID++;
       PushContext();
       _class = MkClass(table.symbol, MkListOne(MkSpecifierName("Id")), idClassDefs);
       PopContext(curContext);
@@ -1053,7 +1046,6 @@ static void ProcessDBTable(DBTableDef table)
                   def = MkClassDefProperty(MkProperty(
                      CopyList(entry.dataType.qualifiers, CopySpecifier), CopyDeclarator(entry.dataType.declarator),
                         CopyIdentifier(entry.id), idSet, idGet));
-                  def.propertyDef.symbol.id = def.propertyDef.symbol.idCode = symbolID;
                   def.propertyDef.isDBProp = true;
                   def.memberAccess = publicAccess;
                   idClassDefs->Add(def);
@@ -1145,10 +1137,10 @@ public void ProcessDBTableDefinitions()
    if(inCompiler)
       PrePreProcessClassDefinitions();
 
-   DeclClass(0, "Field");
-   DeclClass(0, "Table");
-   DeclClass(0, "Row");
-   DeclClass(0, "Id");
+   DeclClass(null, "Field");
+   DeclClass(null, "Table");
+   DeclClass(null, "Row");
+   DeclClass(null, "Id");
    numIndexes = 0;
    if(ast != null)
    {
@@ -1156,7 +1148,6 @@ public void ProcessDBTableDefinitions()
       {
          curExternal = external;
 
-         if(external.symbol) curSymbolID = external.symbol.idCode;
          addAfter = external.prev;
          switch(external.type)
          {
@@ -1170,7 +1161,6 @@ public void ProcessDBTableDefinitions()
       {
          curExternal = external;
 
-         if(external.symbol) curSymbolID = external.symbol.idCode;
          addAfter = external.prev;
 
          switch(external.type)