Changeset 79 in dev for BasicCompiler32

Timestamp:

Mar 25, 2007, 5:58:57 AM (18 years ago)

Author:

dai_9181

Message:

バージョンをβ17にした。
#strictをデフォルトの状態で適用するようにした（#90）。
Dimステートメントにおいて、初期値式とAsが同時に指定されていたとき、As以降も初期値式の一部として捉えるよう、変更（#91）。
GetTypeDef関数を完全廃止。

Location:

BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (2 diffs)
• Compile_Func.cpp (modified) (1 diff)
• Compile_Var.cpp (modified) (4 diffs)
• NumOpe.cpp (modified) (5 diffs)
• Opcode.h (modified) (1 diff)

BasicCompiler32/BasicCompiler.vcproj

@@ -147 +147 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
-                AdditionalIncludeDirectories="..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN"
                 StringPooling="true"
@@ -245 +245 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
-                AdditionalIncludeDirectories="..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENG"
                 StringPooling="true"

BasicCompiler32/Compile_Func.cpp

@@ -340 +340 @@
     pUserProc->Using();
 }
-void Opcode_Func_SizeOf(const char *Parameter){
-    LONG_PTR lpIndex;
-    int type = GetTypeFixed(Parameter,&lpIndex);
-
-    int size;
-    if( type == DEF_OBJECT ){
-        CClass *pClass = (CClass *)lpIndex;
-        size = pClass->GetSize();
-    }
-    else{
-        size=GetTypeSize(type,lpIndex);
-    }
+void Opcode_Func_SizeOf( const string &typeName ){
+    Type tempType;
+    if( !Type::StringToType( typeName, tempType ) ){
+        SetError(3,typeName,cp);
+        return;
+    }
+
+    int typeSize = ( tempType.IsObject() ) ?
+        tempType.GetClass().GetSize() : tempType.GetSize();
 
     //mov eax,size
-    op_mov_RV( REG_EAX, size );
+    op_mov_RV( REG_EAX, typeSize );
 }
 void Opcode_Func_VarPtr( const char *Parameter, Type &resultType, bool isCallOn ){

BasicCompiler32/Compile_Var.cpp

@@ -1079 +1079 @@
 }
 
-void dim(bool isRef, char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags){
+void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags){
     if( UserProc::IsGlobalAreaCompiling() ){
         /////////////////////////
@@ -1085 +1085 @@
         /////////////////////////
 
-        AddGlobalVariable(isRef,VarName,SubScripts,type,InitBuf,ConstractParameter,dwFlags);
+        AddGlobalVariable(VarName,SubScripts,type,InitBuf,ConstractParameter,dwFlags);
     }
     else{
@@ -1092 +1092 @@
         /////////////////
 
-        if( UserProc::CompilingUserProc().localVars.BackSearch( VarName ) ){
+        if( UserProc::CompilingUserProc().localVars.DuplicateCheck( VarName ) ){
             //２重定義のエラー
             SetError(15,VarName,cp);
@@ -1100 +1100 @@
         bool isConst = ( dwFlags & DIMFLAG_CONST ) ? true:false;
 
-        Variable *pVar = new Variable( VarName, type, isConst, isRef );
+        Variable *pVar = new Variable( VarName, type, isConst );
 
         if( SubScripts[0] != -1 ){

BasicCompiler32/NumOpe.cpp

@@ -151 +151 @@
     int sp;
     int type_stack[255];
+    bool isNothing_stack[255];
     LONG_PTR index_stack[255];
     BOOL bUseHeap[255];
@@ -160 +161 @@
         if(idCalc){
             if(type_stack[sp-2]==DEF_OBJECT){
-                //オーバーロードされたオペレータを呼び出す
-                i2=CallOperatorProc(idCalc,baseType,type_stack,index_stack,bUseHeap,sp);
-                if(i2==0){
-                    if(idCalc==CALC_EQUAL) lstrcpy(temp2,"==");
-                    else GetCalcName(idCalc,temp2);
-                    sprintf(temporary,"Operator %s",temp2);
-                    SetError(27,temporary,cp);
-                    goto error;
+                if( idCalc == CALC_AS
+                    && type_stack[sp-1] == ( DEF_OBJECT | FLAG_CAST )
+                    && index_stack[sp-1] == index_stack[sp-2]
+                    || isNothing_stack[sp-2] ){
+                        // 同一の型、またはNothingに対するAsはAs演算子を呼び出さない
                 }
-                else if(i2==-1) goto error;
-
-                continue;
+                else{
+                    //オーバーロードされたオペレータを呼び出す
+                    i2=CallOperatorProc(idCalc,baseType,type_stack,index_stack,bUseHeap,sp);
+                    if(i2==0){
+                        if(idCalc==CALC_EQUAL) lstrcpy(temp2,"==");
+                        else GetCalcName(idCalc,temp2);
+                        sprintf(temporary,"Operator %s",temp2);
+                        SetError(27,temporary,cp);
+                        goto error;
+                    }
+                    else if(i2==-1) goto error;
+
+                    continue;
+                }
             }
 
@@ -181 +190 @@
             case 0:
                 index_stack[sp]=-1;
+                isNothing_stack[sp] = false;
                 bUseHeap[sp]=0;
 
@@ -363 +373 @@
                     // Nothing
                     if( lstrcmp( term, "Nothing" ) == 0 ){
+                        isNothing_stack[sp] = true;
+
                         type_stack[sp] = DEF_OBJECT;
                         if( baseType.IsObject() ){
@@ -489 +501 @@
                     // 型名の場合
                     //////////////
-
-                    LONG_PTR lp;
-                    i3=GetTypeFixed(term,&lp);
-                    if(i3!=-1){
-                        type_stack[sp]=i3|FLAG_CAST;
-                        index_stack[sp]=lp;
+                    Type tempType;
+                    if( Type::StringToType( term, tempType ) ){
+                        type_stack[sp] = tempType.GetBasicType() | FLAG_CAST;
+                        index_stack[sp] = tempType.GetIndex();
                         sp++;
                         break;
                     }
-
 
 

BasicCompiler32/Opcode.h

@@ -190 +190 @@
 #define DIMFLAG_STATIC                  4
 #define DIMFLAG_CONST                   8
-void dim(bool isRef, char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
+void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
 void SetVarPtrToEax(RELATIVE_VAR *pRelativeVar);