Changeset 67 in dev for BasicCompiler_Common

Timestamp:

Mar 11, 2007, 3:25:42 AM (18 years ago)

Author:

dai_9181

Message:

[32bit Compiler]op_push_value → op_push_V
Nothingに対応。

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (6 diffs)
• Class.h (modified) (1 diff)
• Intermediate_Step1.cpp (modified) (1 diff)
• NumOpe_GetType.cpp (modified) (1 diff)
• Variable.cpp (modified) (1 diff)
• preprocessor.cpp (modified) (3 diffs)

BasicCompiler_Common/Class.cpp

@@ -118 +118 @@
         pobj_c=pobj_DBClass->Iterator_GetNext();
 
+        int i=0;
         foreach( CMember *member, pobj_c->staticMembers ){
             char temporary[VN_SIZE];
@@ -137 +138 @@
                 OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize); //matea
             }
+            i++;
         }
     }
@@ -671 +673 @@
 }
 
-CDBClass::CDBClass(){
-    memset(this,0,sizeof(CDBClass));
+CDBClass::CDBClass():
+    pStringClass( NULL ),
+    pObjectClass( NULL ),
+    pCompilingClass( NULL ),
+    pCompilingMethod( NULL ),
+    ppobj_IteClass( NULL ),
+    iIteMaxNum( 0 ),
+    iIteNextNum( 0 )
+{
+    memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) );
 }
 CDBClass::~CDBClass(){
@@ -731 +741 @@
         //Stringクラス
         pobj_StringClass=pobj_c;
+    }
+    if( lstrcmp( name, "Object" ) == 0 ){
+        pObjectClass = pobj_c;
     }
 
@@ -1421 +1434 @@
 }
 
-void CDBClass::GetObjectClassInfo(void){
+void CDBClass::GetAllClassInfo(void){
     //ループ継承チェック用のクラス
     pobj_LoopRefCheck=new CLoopRefCheck();
@@ -1430 +1443 @@
     delete pobj_LoopRefCheck;
     pobj_LoopRefCheck=0;
+}
+
+CClass *CDBClass::GetStringClass() const
+{
+    if( !pStringClass ){
+        SetError();
+        return NULL;
+    }
+    return pStringClass;
+}
+CClass *CDBClass::GetObjectClass() const
+{
+    if( !pObjectClass ){
+        SetError();
+        return NULL;
+    }
+    return pObjectClass;
 }
 

BasicCompiler_Common/Class.h

@@ -229 +229 @@
     void InitNames(void);
     void GetClass_recur(const char *lpszInheritsClass);
-    void GetObjectClassInfo(void);
+    void GetAllClassInfo(void);
+
+
+    /////////////////////////////
+    // 特殊クラス
+    /////////////////////////////
+    CClass *pStringClass;
+    CClass *pObjectClass;
+    CClass *GetStringClass() const;
+    CClass *GetObjectClass() const;
 
 

BasicCompiler_Common/Intermediate_Step1.cpp

@@ -872 +872 @@
                 case 'n':
                 case 'N':
-                    if(lstrcmpi(temporary+i3,"Not")==0){
+                    if(lstrcmpi(temporary+i3,"New")==0){
+                        i2=i3;
+                        temporary[i2++]=1;
+                        temporary[i2]=ESC_NEW;
+                    }
+                    else if(lstrcmpi(temporary+i3,"Not")==0){
                         i2=i3;
                         temporary[i2++]=1;
                         temporary[i2]=ESC_NOT;
-                    }
-                    else if(lstrcmpi(temporary+i3,"New")==0){
-                        i2=i3;
-                        temporary[i2++]=1;
-                        temporary[i2]=ESC_NEW;
                     }
                     break;

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -492 +492 @@
 
 
+                    // Nothing
+                    if( lstrcmp( term, "Nothing" ) == 0 ){
+                        type[sp] = DEF_OBJECT;
+                        if( pBaseType && pBaseType->type == DEF_OBJECT ){
+                            index_stack[sp] = pBaseType->u.lpIndex;
+                        }
+                        else{
+                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClass();
+                        }
+                        bLiteralCalculation = 0;
+                        sp++;
+                        break;
+                    }
+
+
                     i2=GetVarType(term,&index_stack[sp],0);
                     if(i2!=-1){

BasicCompiler_Common/Variable.cpp

@@ -1029 +1029 @@
         if(pTypeInfo->type==-1){
             SetError(3,temporary,cp);
-            return 0;
+            pTypeInfo->type=DEF_LONG;
         }
 

BasicCompiler_Common/preprocessor.cpp

@@ -142 +142 @@
 CDefine *pobj_define;
 
-int Search_endif(char *buffer,int i){
+int Search_endif(char *buffer,int i, int *pLine = 0){
     for(;;i++){
         if(buffer[i]=='\0') break;
 
+        if( buffer[i] == '\n' ){
+            if( pLine ){
+                (*pLine)++;
+            }
+        }
+
         if(buffer[i-1]=='\n'){
             if(_memicmp(buffer+i,"#ifdef",6)==0||_memicmp(buffer+i,"#ifndef",7)==0){
-                i=Search_endif(buffer,i+6);
+                i=Search_endif(buffer,i+6, pLine);
                 if(buffer[i]=='\0') break;
                 continue;
@@ -229 +235 @@
                 if(i2==0||buffer[i2-1]=='\n'){
                     if(_memicmp(buffer+i2,"#ifdef",6)==0||_memicmp(buffer+i2,"#ifndef",7)==0){
-                        i2=Search_endif(buffer,i2+6);
+                        i2=Search_endif(buffer,i2+6, &i3 );
                         if(buffer[i2]=='\0') break;
                         continue;
@@ -256 +262 @@
             if(i2==0||buffer[i2-1]=='\n'){
                 if(_memicmp(buffer+i2,"#ifdef",6)==0||_memicmp(buffer+i2,"#ifndef",7)==0){
-                    i2=Search_endif(buffer,i2+6);
+                    i2=Search_endif(buffer,i2+6, &i3 );
                     if(buffer[i2]=='\0') break;
                     continue;