Changeset 182 in dev for trunk/abdev/BasicCompiler_Common/Compile.cpp

Timestamp:

Jun 24, 2007, 6:49:13 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/Compile.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+#include <jenga/include/smoothie/SmoothieException.h>
+
+#include <LexicalScopingImpl.h>
+#include <CodeGenerator.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -7 +14 @@
 #endif
 
+#include <Exception.h>
+
 //ラベルアドレス
 LABEL *pLabelNames;
@@ -33 +42 @@
 WITHINFO WithInfo;
 
-
-int obp,obp_AllocSize;
-int GlobalOpBufferSize;
-char *OpBuffer;
-void ReallocNativeCodeBuffer(){
-    if(obp_AllocSize<obp+8192){
-        obp_AllocSize+=8192;
-        OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize); //matea
-    }
-}
 
 
@@ -177 +176 @@
                 break;
             case ESC_EXITWHILE:
-                obj_LexScopes.ExitWhile();
+                {
+                    CScope *pScope = GetLexicalScopes().SearchScope( SCOPE_TYPE_WHILE );
+                    if( !pScope ){
+                        SetError(12,"Exit While",cp);
+                        return;
+                    }
+                    pScope->Break();
+                }
                 break;
             case ESC_EXITFOR:
-                obj_LexScopes.ExitFor();
+                {
+                    CScope *pScope = GetLexicalScopes().SearchScope( SCOPE_TYPE_FOR );
+                    if( !pScope ){
+                        SetError(12,"Exit For",cp);
+                        return;
+                    }
+                    pScope->Break();
+                }
                 break;
             case ESC_EXITDO:
-                obj_LexScopes.ExitDo();
+                {
+                    CScope *pScope = GetLexicalScopes().SearchScope( SCOPE_TYPE_DO );
+                    if( !pScope ){
+                        SetError(12,"Exit Do",cp);
+                        return;
+                    }
+                    pScope->Break();
+                }
                 break;
             case ESC_CONTINUE:
@@ -231 +251 @@
 
             case ESC_NAMESPACE:
-                Smoothie::Lexical::liveingNamespaceScopes.push_back( Command + 2 );
+                Smoothie::Temp::liveingNamespaceScopes.push_back( Command + 2 );
                 break;
             case ESC_ENDNAMESPACE:
-                if( Smoothie::Lexical::liveingNamespaceScopes.size() <= 0 ){
+                if( Smoothie::Temp::liveingNamespaceScopes.size() <= 0 ){
                     SetError(12,"End Namespace",cp);
                 }
-                Smoothie::Lexical::liveingNamespaceScopes.pop_back();
+                Smoothie::Temp::liveingNamespaceScopes.pop_back();
                 break;
             case ESC_IMPORTS:
@@ -641 +661 @@
             }
 
-            ChangeOpcode(Command);
+            try
+            {
+                ChangeOpcode(Command);
+            }
+            catch( const SmoothieException &smoothieException )
+            {
+                SetError(
+                    smoothieException.GetErrorCode(),
+                    smoothieException.GetKeyword(),
+                    smoothieException.GetNowLine()
+                );
+            }
 
 #ifdef _DEBUG
@@ -651 +682 @@
             if(bStopCompile) return 0;
 
-            if(obp_AllocSize<obp+8192){
-                obp_AllocSize+=8192;
-                OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize);
-            }
+            ReallocNativeCodeBuffer();
 
             if(basbuf[cp]=='\0'){