Changeset 205 in dev for trunk/jenga/src

Timestamp:

Jul 12, 2007, 2:57:04 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

Location:

trunk/jenga/src/smoothie

Files:

• Class.cpp (deleted)
• LexicalAnalysis.cpp (modified) (2 diffs)
• LexicalScoping.cpp (modified) (2 diffs)
• Method.cpp (deleted)
• Procedure.cpp (deleted)
• Prototype.cpp (deleted)
• Smoothie.cpp (modified) (1 diff)
• Symbol.cpp (deleted)
• Type.cpp (deleted)
• Variable.cpp (deleted)

trunk/jenga/src/smoothie/LexicalAnalysis.cpp

@@ +1 @@
+#include <jenga/include/smoothie/SmoothieException.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
+#include <jenga/include/smoothie/BasicFixed.h>
 
 #include <windows.h>
@@ -212 +214 @@
     return i;
 }
+
+bool SplitMemberName( const char *desc, char *object, char *member, ReferenceKind &refType ){
+    int lastIndex = -1;
+    for( int i=0; desc[i]; i++ ){
+        if( desc[i] == '(' ){
+            i=JumpStringInPare(desc,i+1);
+            continue;
+        }
+        else if( desc[i] == '[' ){
+            i=JumpStringInBracket(desc,i+1);
+            continue;
+        }
+        else if(desc[i]=='.'||(desc[i]==1&&desc[i+1]==ESC_PSMEM)){
+            lastIndex = i;
+        }
+    }
+    if( lastIndex == -1 ){
+        lstrcpy( member, desc );
+        return false;
+    }
+
+    if(desc[lastIndex]=='.'){
+        lstrcpy(member,desc+lastIndex+1);
+        refType = RefDot;
+    }
+    else{
+        lstrcpy(member,desc+lastIndex+2);
+        refType = RefPointer;
+    }
+
+    if( object ){
+        lstrcpy( object, desc );
+        object[lastIndex]=0;
+    }
+
+    return true;
+}
+bool SplitMemberName( const char *desc, char *object, char *member ){
+    ReferenceKind dummyRefType;
+    return SplitMemberName( desc, object, member, dummyRefType );
+}
+
+char *calcNames[255] = {
+    "xor",
+};
+void InitCalcNames()
+{
+    if( calcNames[CALC_XOR] )
+    {
+        return;
+    }
+
+    memset( calcNames, 0, 255 * sizeof(char *) );
+    calcNames[CALC_XOR] = "xor";
+    calcNames[CALC_OR] = "or";
+    calcNames[CALC_AND] = "and";
+    calcNames[CALC_NOT] = "Not";
+    calcNames[CALC_PE] = "<=";
+    calcNames[CALC_QE] = ">=";
+    calcNames[CALC_NOTEQUAL] = "<>";
+    calcNames[CALC_EQUAL] = "=(compare)";
+    calcNames[CALC_P] = "<";
+    calcNames[CALC_Q] = ">";
+    calcNames[CALC_SHL] = "<<";
+    calcNames[CALC_SHR] = ">>";
+    calcNames[CALC_ADDITION] = "+";
+    calcNames[CALC_SUBTRACTION] = "-";
+    calcNames[CALC_STRPLUS] = "-";
+    calcNames[CALC_MOD] = "mod";
+    calcNames[CALC_PRODUCT] = "*";
+    calcNames[CALC_QUOTIENT] = "/";
+    calcNames[CALC_INTQUOTIENT] = "\\";
+    calcNames[CALC_AS] = "As";
+    calcNames[CALC_BYVAL] = "ByVal";
+    calcNames[CALC_MINUSMARK] = "-(mark)";
+    calcNames[CALC_POWER] = "^";
+    calcNames[CALC_SUBSITUATION] = "=";
+    calcNames[CALC_ARRAY_GET] = "[]";
+    calcNames[CALC_ARRAY_SET] = "[]=";
+}
+void GetCalcName(int idCalc,char *name){
+    InitCalcNames();
+
+    if( calcNames[idCalc] == NULL )
+    {
+        SmoothieException::Throw();
+    }
+    lstrcpy( name, calcNames[idCalc] );
+}
+BYTE ToCalcId( const char *name )
+{
+    InitCalcNames();
+
+    for( int i=0; i<255; i++ )
+    {
+        if( calcNames[i] )
+        {
+            if( lstrcmp( name, calcNames[i] ) == 0 )
+            {
+                return i;
+            }
+        }
+    }
+    SmoothieException::Throw();
+    return 0;
+}
+
+std::string Operator_NaturalStringToCalcMarkString( const std::string &name )
+{
+    if( name[0] == 1 && name[1] == ESC_OPERATOR )
+    {
+        BYTE calcId = ToCalcId( name.c_str()+2 );
+        char temporary[255];
+        temporary[0] = name[0];
+        temporary[1] = name[1];
+        temporary[2] = calcId;
+        temporary[3] = 0;
+        return temporary;
+    }
+    return name;
+}
+std::string Operator_CalcMarkStringToNaturalString( const std::string &name )
+{
+    if( name[0] == 1 && name[1] == ESC_OPERATOR )
+    {
+        BYTE calcId = name[2];
+        char temporary[255], calcName[255];
+        GetCalcName( calcId, calcName );
+        temporary[0] = name[0];
+        temporary[1] = name[1];
+        lstrcpy( temporary+2, calcName );
+        return temporary;
+    }
+    return name;
+}

trunk/jenga/src/smoothie/LexicalScoping.cpp

@@ -1 +1 @@
 #include <jenga/include/smoothie/LexicalScoping.h>
 #include <jenga/include/smoothie/SmoothieException.h>
-#include <jenga/include/smoothie/Variable.h>
-#include <jenga/include/smoothie/Procedure.h>
 
 
@@ -54 +52 @@
     ppScopes[level] = CreateScope( level, addr, TypeOfStatement );
 }
-void CLexicalScopes::End(){
-    if( level <= 0 ){
-        SmoothieException::Throw();
-        return;
-    }
-
-    //デストラクタを呼ぶ
-    CallDestructorsOfScopeEnd();
-
-    Variables &vars = UserProc::IsGlobalAreaCompiling()?
-        globalVars :
-        UserProc::CompilingUserProc().localVars;
-
-    //使用済みローカル変数の生存チェックを外す
-    BOOST_FOREACH( Variable *pVar, vars ){
-        if(pVar->bLiving&&pVar->ScopeLevel==level){
-            pVar->bLiving=0;
-            extern int obp;
-            pVar->ScopeEndAddress=obp;
-        }
-    }
-
-
-    //スコープ抜け出しスケジュール
-    ppScopes[level]->RunScheduleOfBreak();
-
-
-    //スコープレベルを下げる
-    delete ppScopes[level];
-    level--;
-}
 
 int CLexicalScopes::GetNowLevel(){

trunk/jenga/src/smoothie/Smoothie.cpp

@@ -4 +4 @@
 BasicSource Smoothie::Lexical::source;
 
-const CClass *Smoothie::Temp::pCompilingClass = NULL;
-
 bool Smoothie::isFullCompile = false;