Changeset 107 in dev for BasicCompiler_Common

Timestamp:

May 6, 2007, 3:17:56 PM (17 years ago)

Author:

dai_9181

Message:

Importsステートメントを導入した。実装は作り途中。

Location:

BasicCompiler_Common

Files:

• BasicFixed.h (modified) (1 diff)
• Compile.cpp (modified) (1 diff)
• Intermediate_Step1.cpp (modified) (2 diffs)
• Intermediate_Step2.cpp (modified) (1 diff)
• common.h (modified) (3 diffs)
• error.cpp (modified) (1 diff)
• include/Namespace.h (modified) (3 diffs)
• include/Smoothie.h (modified) (2 diffs)
• src/Namespace.cpp (modified) (2 diffs)
• src/Smoothie.cpp (modified) (2 diffs)

BasicCompiler_Common/BasicFixed.h

@@ -178 +178 @@
 #define ESC_NAMESPACE       'o'     // Namespace
 #define ESC_ENDNAMESPACE    'p'     // End Namespace
+#define ESC_IMPORTS         'q'     // Imports
+#define ESC_CLEARNAMESPACEIMPORTED 'r'  // _ClearNamespaceImported
 //EXEファイル用制御エスケープシーケンス
-#define ESC_USING           'q'     // Print命令語のUsing
-#define ESC_FOR             'r'     // Open命令語のFor
-#define ESC_LINENUM         's'     // 行番号を示す
+#define ESC_USING           's'     // Print命令語のUsing
+#define ESC_FOR             't'     // Open命令語のFor
+#define ESC_LINENUM         'u'     // 行番号を示す
 
 //オブジェクト指向エスケープシーケンス

BasicCompiler_Common/Compile.cpp

@@ -229 +229 @@
                 }
                 Smoothie::Lexical::liveingNamespaceScopes.pop_back();
+                break;
+            case ESC_IMPORTS:
+                Smoothie::Meta::importedNamespaces.Imports( Command + 2 );
+                break;
+            case ESC_CLEARNAMESPACEIMPORTED:
+                Smoothie::Meta::importedNamespaces.clear();
                 break;
 

BasicCompiler_Common/Intermediate_Step1.cpp

@@ -447 +447 @@
 
             switch(temporary[i3]){
+                case '_':
+                    if(lstrcmpi(temporary+i3,"_ClearNamespaceImported")==0){
+                        i2=i3;
+                        temporary[i2++]=1;
+                        temporary[i2]=ESC_CLEARNAMESPACEIMPORTED;
+                    }
+                    break;
                 case 'a':
                 case 'A':
@@ -755 +762 @@
                         temporary[i2++]=1;
                         temporary[i2]=ESC_IF;
+                    }
+                    else if(lstrcmpi(temporary+i3,"Imports")==0){
+                        i2=i3;
+                        temporary[i2++]=1;
+                        temporary[i2]=ESC_IMPORTS;
                     }
                     else if(lstrcmpi(temporary+i3,"Inherits")==0){

BasicCompiler_Common/Intermediate_Step2.cpp

@@ -462 +462 @@
             case ESC_STATIC:
             case ESC_NAMESPACE:
+            case ESC_IMPORTS:
                 KillStringSpaces(Command+2);
                 break;

BasicCompiler_Common/common.h

@@ -47 +47 @@
 
 #ifdef _AMD64_
-#define VER_INFO        "(x64) β rev.217"
+#define VER_INFO        "(x64) β rev.228"
 #else
-#define VER_INFO        "β rev.217"
+#define VER_INFO        "β rev.228"
 #endif
 
@@ -61 +61 @@
 
 
-#pragma comment(lib, "psapi.lib")
-
-
 #define PTR_SIZE        sizeof(LONG_PTR)
 
@@ -84 +81 @@
 
 //未定義の定数情報
-#define IMAGE_FILE_MACHINE_AMD64 0x8664
-
+#ifndef IMAGE_FILE_MACHINE_AMD64
+    #define IMAGE_FILE_MACHINE_AMD64 0x8664
+#endif
+
+#ifdef _AMD64_
+    #ifndef IMAGE_SIZEOF_NT_OPTIONAL64_HEADER
+        #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER    240
+    #endif
+#else
+    #ifndef IMAGE_SIZEOF_NT_OPTIONAL32_HEADER
+        #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER    224
+    #endif
+#endif
 
 

BasicCompiler_Common/error.cpp

@@ -152 +152 @@
     if(num==62) sprintf(msg,"グローバル領域でのReturnは禁止されています。",tempKeyWord);
     if(num==63) lstrcpy(msg,"名前空間が正しく閉じられていません。");
+    if(num==64) sprintf(msg,"\"%s\" 無効な名前空間です。",tempKeyWord);
 
 

BasicCompiler_Common/include/Namespace.h

@@ -70 +70 @@
     }
 
-    bool IsUsing() const
-    {
-        // TODO: 実装
-        return false;
-    }
+    bool IsImported() const;
 
     bool IsLiving() const;
@@ -98 +94 @@
             if( baseNamespaceScopes.size() ){
                 // 名前空間の判断が必要なとき
-                if( baseNamespaceScopes.IsUsing()
+                if( baseNamespaceScopes.IsImported()
                     || baseNamespaceScopes.IsLiving() ){
                     // Using指定があるとき
@@ -134 +130 @@
     void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const;
 
+    void Imports( const string &namespaceStr );
+
     static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );
 };

BasicCompiler_Common/include/Smoothie.h

@@ -19 +19 @@
 #endif
         }
-        static void Put( const string &text ){
-#ifdef _DEBUG
-            log += text + "\r\n";
-
-            {
-                ofstream ofs( ( (string)BasicSystemDir + "Log\\compile.log" ).c_str(), ios_base::app );
-                ofs << text << endl;
-                ofs.close();
-            }
-#endif
-        }
+        static void Put( const string &text );
         static void PutFile( const string &fileName, const string &buffer ){
             ofstream ofs( ( (string)BasicSystemDir + "Log\\" + fileName ).c_str() );
@@ -49 +39 @@
         static vector<ProcPointer *> procPointers;
         static NamespaceScopesCollection namespaceScopesCollection;
+        static NamespaceScopesCollection importedNamespaces;
     };
 };

BasicCompiler_Common/src/Namespace.cpp

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

BasicCompiler_Common/src/Smoothie.cpp

@@ -2 +2 @@
 
 string Smoothie::Logger::log = "";
+
+void Smoothie::Logger::Put( const string &text )
+{
+//#ifdef _DEBUG
+    log += text + "\r\n";
+
+    {
+        ofstream ofs( ( (string)BasicSystemDir + "Log\\compile.log" ).c_str(), ios_base::app );
+        ofs << text << endl;
+        ofs.close();
+    }
+//#endif
+}
 
 BasicSource Smoothie::Lexical::source;
@@ -9 +22 @@
 vector<ProcPointer *> Smoothie::Meta::procPointers;
 NamespaceScopesCollection Smoothie::Meta::namespaceScopesCollection;
+NamespaceScopesCollection Smoothie::Meta::importedNamespaces;