Changeset 169 in dev for trunk/abdev

Timestamp:

Jun 18, 2007, 3:49:30 AM (17 years ago)

Author:

dai_9181

Message:

NamespaceScopesCollection::Importsをリファクタリング

Location:

trunk/abdev

Files:

• BasicCompiler64/BasicCompiler.vcproj (modified) (4 diffs)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler64/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler_Common/Class.cpp (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• BasicCompiler_Common/TypeDef.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Namespace.h (modified) (1 diff)
• BasicCompiler_Common/src/Namespace.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler64/BasicCompiler.vcproj

@@ -48 +48 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
                 MinimalRebuild="true"
@@ -154 +154 @@
                 InlineFunctionExpansion="2"
                 FavorSizeOrSpeed="1"
-                AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
                 MinimalRebuild="false"
@@ -358 +358 @@
                 </Filter>
             </Filter>
+            <Filter
+                Name="Application Classes"
+                >
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Program.h"
+                    >
+                </File>
+            </Filter>
         </Filter>
         <Filter
@@ -1126 +1134 @@
                 </Filter>
             </Filter>
+            <Filter
+                Name="Application Classes"
+                >
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\Program.cpp"
+                    >
+                </File>
+            </Filter>
         </Filter>
     </Files>

trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ +1 @@
+#include <Program.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -797 +799 @@
     lstrcat( temporary, "------------------------------------------------------------------\n" );
     lstrcat( temporary, "\n" );
-    Smoothie::Logger::Put( temporary );
+    trace_for_size( temporary );
 }
 void CompileLocal(){

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ +1 @@
+#include <jenga/include/common/Environment.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -1156 +1158 @@
     char *DosStubBuffer;
     int DosStubSize;
-    extern char BasicSystemDir[MAX_PATH];
-    sprintf(temporary,"%sSubOperation\\dosstub.pgm",BasicSystemDir);
-    hFile=CreateFile(temporary,GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    hFile=CreateFile(
+        ( Jenga::Common::Environment::GetAppDir() + "\\SubOperation\\dosstub.pgm" ).c_str(),
+        GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE){
         MessageBox(hOwnerEditor,"dosstub.pgmの読み込みに失敗","error",MB_OK);

trunk/abdev/BasicCompiler_Common/Class.cpp

@@ -785 +785 @@
                 temporary[i2]=basbuf[i];
             }
-            importedNamespaces.Imports( temporary );
+            if( !importedNamespaces.Imports( temporary ) )
+            {
+                SetError(64,temporary,cp );
+            }
 
             continue;

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -720 +720 @@
                 temporary[i2]=basbuf[i];
             }
-            importedNamespaces.Imports( temporary );
+            if( !importedNamespaces.Imports( temporary ) )
+            {
+                SetError(64,temporary,cp );
+            }
 
             continue;

trunk/abdev/BasicCompiler_Common/TypeDef.cpp

@@ -192 +192 @@
                 temporary[i2]=basbuf[i];
             }
-            importedNamespaces.Imports( temporary );
+            if( !importedNamespaces.Imports( temporary ) )
+            {
+                SetError(64,temporary,cp );
+            }
 
             continue;

trunk/abdev/BasicCompiler_Common/include/Namespace.h

@@ -130 +130 @@
     void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const;
 
-    void Imports( const string &namespaceStr );
+    bool Imports( const string &namespaceStr );
 
     static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );

trunk/abdev/BasicCompiler_Common/src/Namespace.cpp

@@ -101 +101 @@
     lstrcpy( simpleName, fullName + lstrlen( namespaceStr ) + dotLength );
 }
-void NamespaceScopesCollection::Imports( const string &namespaceStr ){
+bool NamespaceScopesCollection::Imports( const string &namespaceStr ){
     NamespaceScopes namespaceScopes( namespaceStr );
     if( !Smoothie::meta.namespaceScopesCollection.IsExist( namespaceScopes ) ){
-        SetError(64,namespaceStr.c_str(),cp );
-        return;
+        return false;
     }
 
     this->push_back( namespaceScopes );
+
+    return true;
 }
 bool NamespaceScopesCollection::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )