Changeset 193 in dev for trunk/abdev/BasicCompiler_Common/src/ProcedureImpl.cpp

Timestamp:

Jun 26, 2007, 5:04:50 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/ProcedureImpl.cpp (modified) (11 diffs)

trunk/abdev/BasicCompiler_Common/src/ProcedureImpl.cpp

@@ -2 +2 @@
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
+#include <Compiler.h>
 #include <ProcedureImpl.h>
 
@@ -104 +105 @@
             //cp = nowLine;
 
-            NumOpe_GetType( initValue, Type::String(), type );
+            NumOpe_GetType( initValue, GetStringTypeInfo(), type );
         }
         else if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_AS){
@@ -129 +130 @@
             }
 
-            Type::StringToType( temporary, type );
+            Compiler::StringToType( temporary, type );
 
             if( type.IsNull() ){
@@ -257 +258 @@
                 }
 
-                Type::StringToType( temporary, type );
+                Compiler::StringToType( temporary, type );
 
                 if( type.IsNull() ){
@@ -326 +327 @@
                     temporary[i3]=sourceOfParams[i2];
                 }
-                Type::StringToType( temporary, this->returnType );
+                Compiler::StringToType( temporary, this->returnType );
                 if( this->returnType.IsNull() ) SmoothieException::Throw(3,temporary,nowLine);
 
@@ -387 +388 @@
     }
 
-    return NamespaceScopes::IsSameArea( GetNamespaceScopes(), namespaceScopes );
+    return compiler.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
 }
 bool GlobalProc::IsEqualSymbol( const GlobalProc &globalProc ) const
@@ -402 +403 @@
 }
 
+bool DllProcImpl::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
+{
+    if( GetName() != name ){
+        return false;
+    }
+    return compiler.IsSameAreaNamespace( this->GetNamespaceScopes(), namespaceScopes );
+}
 bool DllProcImpl::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){
     int i = 0;
@@ -505 +513 @@
             }
 
-            Type::StringToType( temporary, type );
+            Compiler::StringToType( temporary, type );
 
             if( type.IsNull() ){
@@ -559 +567 @@
                     temporary[i3]=sourceOfParams[i2];
                 }
-                Type::StringToType( temporary, this->returnType );
+                Compiler::StringToType( temporary, this->returnType );
                 if( this->returnType.IsNull() ) SmoothieException::Throw(3,temporary,nowLine);
 
@@ -676 +684 @@
             }
 
-            Type::StringToType( temporary, type );
+            Compiler::StringToType( temporary, type );
 
             if( type.IsNull() ){
@@ -730 +738 @@
                     temporary[i3]=sourceOfParams[i2];
                 }
-                Type::StringToType( temporary, this->returnType );
+                Compiler::StringToType( temporary, this->returnType );
                 if( this->returnType.IsNull() ) SmoothieException::Throw(3,temporary,nowLine);