Changeset 198 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jun 27, 2007, 2:41:17 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• NumOpe_GetType.cpp (modified) (2 diffs)
• Object.cpp (modified) (1 diff)
• VariableOpe.cpp (modified) (1 diff)
• calculation.cpp (modified) (2 diffs)
• include/NamespaceSupporter.h (modified) (1 diff)
• src/ClassImpl.cpp (modified) (1 diff)
• src/ProcedureImpl.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -286 +286 @@
     }
 
-    if( !Compiler::StringToType( TypeName, resultType ) ){
+    if( !compiler.StringToType( TypeName, resultType ) ){
         return false;
     }
@@ -637 +637 @@
                     // As演算子の右辺値
                     //型名
-                    if( Compiler::StringToType( term, resultType ) ){
+                    if( compiler.StringToType( term, resultType ) ){
 
                         if( resultType.IsObject() ){

trunk/abdev/BasicCompiler_Common/Object.cpp

@@ -116 +116 @@
     }
 
-    if( !Compiler::StringToType( typeName, resultType ) ){
+    if( !compiler.StringToType( typeName, resultType ) ){
         SetError(3,typeName,cp);
         return false;

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -873 +873 @@
         }
 
-        if( !Compiler::StringToType( temporary, type ) ){
+        if( !compiler.StringToType( temporary, type ) ){
             SetError(3,temporary,cp);
             type.SetBasicType( DEF_LONG );

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ -488 +488 @@
 
                         Type tempType;
-                        if( !Compiler::StringToType( temp2, tempType ) ){
+                        if( !compiler.StringToType( temp2, tempType ) ){
                             if(enableerror) SetError(3,temp2,cp);
                             return false;
@@ -692 +692 @@
                         {
                             Type tempType;
-                            if( !Compiler::StringToType( Parms, tempType ) ){
+                            if( !compiler.StringToType( Parms, tempType ) ){
                                 if(bDebuggingWatchList){
                                     if( pIsMemoryAccessError ) *pIsMemoryAccessError = true;

trunk/abdev/BasicCompiler_Common/include/NamespaceSupporter.h

@@ -35 +35 @@
     {
         return livingNamespaceScopes;
+    }
+    void SetLivingNamespaceScopes( const NamespaceScopes &namespaceScopes )
+    {
+        this->livingNamespaceScopes = namespaceScopes;
     }
     bool IsLiving( const NamespaceScopes &namespaceScopes ) const

trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp

@@ -590 +590 @@
                     i+=10;
                     i+=GetStringInPare_RemovePare(temporary,source.GetBuffer()+i)+1;
-                    Compiler::StringToType( temporary, blittableType );
+                    compiler.StringToType( temporary, blittableType );
                 }
 

trunk/abdev/BasicCompiler_Common/src/ProcedureImpl.cpp

@@ -131 +131 @@
             }
 
-            Compiler::StringToType( temporary, type );
+            compiler.StringToType( temporary, type );
 
             if( type.IsNull() ){
@@ -259 +259 @@
                 }
 
-                Compiler::StringToType( temporary, type );
+                compiler.StringToType( temporary, type );
 
                 if( type.IsNull() ){
@@ -328 +328 @@
                     temporary[i3]=sourceOfParams[i2];
                 }
-                Compiler::StringToType( temporary, this->returnType );
+                compiler.StringToType( temporary, this->returnType );
                 if( this->returnType.IsNull() ) SmoothieException::Throw(3,temporary,nowLine);
 
@@ -514 +514 @@
             }
 
-            Compiler::StringToType( temporary, type );
+            compiler.StringToType( temporary, type );
 
             if( type.IsNull() ){
@@ -568 +568 @@
                     temporary[i3]=sourceOfParams[i2];
                 }
-                Compiler::StringToType( temporary, this->returnType );
+                compiler.StringToType( temporary, this->returnType );
                 if( this->returnType.IsNull() ) SmoothieException::Throw(3,temporary,nowLine);
 
@@ -685 +685 @@
             }
 
-            Compiler::StringToType( temporary, type );
+            compiler.StringToType( temporary, type );
 
             if( type.IsNull() ){
@@ -739 +739 @@
                     temporary[i3]=sourceOfParams[i2];
                 }
-                Compiler::StringToType( temporary, this->returnType );
+                compiler.StringToType( temporary, this->returnType );
                 if( this->returnType.IsNull() ) SmoothieException::Throw(3,temporary,nowLine);