Changeset 603 in dev for trunk/ab5.0/abdev/ab_common

Timestamp:

May 10, 2008, 11:10:33 PM (16 years ago)

Author:

dai_9181

Message:

ObjectModuleに関連するクラス一式をab_commonプロジェクトに移動した。

Location:

trunk/ab5.0/abdev/ab_common

Files:

• ab_common.vcproj (modified) (6 diffs)
• include/Lexical/Class.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h )
• include/Lexical/Const.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Const.h )
• include/Lexical/DataTable.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/DataTable.h )
• include/Lexical/Delegate.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Delegate.h )
• include/Lexical/Interface.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Interface.h )
• include/Lexical/Member.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Member.h )
• include/Lexical/Meta.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Meta.h )
• include/Lexical/Method.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Method.h )
• include/Lexical/NativeCode.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h )
• include/Lexical/ObjectModule.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/ObjectModule.h )
• include/Lexical/Parameter.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Parameter.h )
• include/Lexical/Procedure.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Procedure.h )
• include/Lexical/Source.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Source.h )
• include/Lexical/Symbol.h (modified) (1 diff)
• include/Lexical/Type.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Type.h )
• include/Lexical/TypeDef.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/TypeDef.h )
• include/Lexical/Variable.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Variable.h )
• include/ab_common.h (modified) (2 diffs)
• src/Lexical/Class.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp )
• src/Lexical/Const.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Const.cpp )
• src/Lexical/DataTable.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/DataTable.cpp )
• src/Lexical/Delegate.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Delegate.cpp )
• src/Lexical/Interface.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Interface.cpp )
• src/Lexical/Meta.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Meta.cpp )
• src/Lexical/Method.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Method.cpp )
• src/Lexical/NativeCode.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/NativeCode.cpp )
• src/Lexical/ObjectModule.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp ) (1 diff)
• src/Lexical/Parameter.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Parameter.cpp )
• src/Lexical/Procedure.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Procedure.cpp )
• src/Lexical/Source.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp )
• src/Lexical/Symbol.cpp (modified) (1 diff)
• src/Lexical/Type.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Type.cpp )
• src/Lexical/TypeDef.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/TypeDef.cpp )
• src/Lexical/Variable.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Variable.cpp )

trunk/ab5.0/abdev/ab_common/ab_common.vcproj

@@ -104 +104 @@
             <Tool
                 Name="VCCLCompilerTool"
+                InlineFunctionExpansion="2"
+                EnableIntrinsicFunctions="true"
+                FavorSizeOrSpeed="1"
                 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
@@ -228 +231 @@
             <Tool
                 Name="VCCLCompilerTool"
+                InlineFunctionExpansion="2"
+                EnableIntrinsicFunctions="true"
+                FavorSizeOrSpeed="1"
                 AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
@@ -317 +323 @@
                 >
                 <File
+                    RelativePath=".\src\Lexical\Class.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Const.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\DataTable.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Delegate.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Interface.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Meta.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Method.cpp"
+                    >
+                </File>
+                <File
                     RelativePath=".\src\Lexical\Namespace.cpp"
                     >
@@ -325 +359 @@
                 </File>
                 <File
+                    RelativePath=".\src\Lexical\NativeCode.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\ObjectModule.cpp"
+                    >
+                    <FileConfiguration
+                        Name="Debug(x86)|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            UsePrecompiledHeader="0"
+                        />
+                    </FileConfiguration>
+                    <FileConfiguration
+                        Name="Release(x86)|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            UsePrecompiledHeader="0"
+                        />
+                    </FileConfiguration>
+                    <FileConfiguration
+                        Name="Debug(x64)|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            AdditionalOptions="/bigobj"
+                            UsePrecompiledHeader="0"
+                        />
+                    </FileConfiguration>
+                    <FileConfiguration
+                        Name="Release(x64)|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            UsePrecompiledHeader="0"
+                        />
+                    </FileConfiguration>
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Parameter.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Procedure.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Source.cpp"
+                    >
+                </File>
+                <File
                     RelativePath=".\src\Lexical\Symbol.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Type.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\TypeDef.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\Lexical\Variable.cpp"
                     >
                 </File>
@@ -355 +454 @@
                 >
                 <File
+                    RelativePath=".\include\Lexical\Class.h"
+                    >
+                </File>
+                <File
                     RelativePath=".\include\Lexical\CompilerErrorException.h"
                     >
                 </File>
                 <File
+                    RelativePath=".\include\Lexical\Const.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\DataTable.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Delegate.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Interface.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Member.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Meta.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Method.h"
+                    >
+                </File>
+                <File
                     RelativePath=".\include\Lexical\Namespace.h"
                     >
@@ -367 +498 @@
                 </File>
                 <File
+                    RelativePath=".\include\Lexical\NativeCode.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\ObjectModule.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Parameter.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Procedure.h"
+                    >
+                </File>
+                <File
                     RelativePath=".\include\Lexical\Prototype.h"
                     >
                 </File>
                 <File
+                    RelativePath=".\include\Lexical\Source.h"
+                    >
+                </File>
+                <File
                     RelativePath=".\include\Lexical\Symbol.h"
                     >
                 </File>
                 <File
+                    RelativePath=".\include\Lexical\Type.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\TypeDef.h"
+                    >
+                </File>
+                <File
                     RelativePath=".\include\Lexical\TypeMisc.h"
+                    >
+                </File>
+                <File
+                    RelativePath=".\include\Lexical\Variable.h"
                     >
                 </File>

trunk/ab5.0/abdev/ab_common/include/Lexical/Symbol.h

@@ -3 +3 @@
 namespace ActiveBasic{ namespace Common{ namespace Lexical{
 
+std::string Operator_NaturalStringToCalcMarkString( const std::string &name );
+std::string Operator_CalcMarkStringToNaturalString( const std::string &name );
 
 class Symbol

trunk/ab5.0/abdev/ab_common/include/ab_common.h

@@ -1 +1 @@
 #pragma once
+
+#define trace_for_serialize( msg )
 
 #include "BasicFixed.h"
@@ -8 +10 @@
 #include "Lexical/Prototype.h"
 #include "Lexical/TypeMisc.h"
+
+using namespace ActiveBasic::Common::Lexical;
+
+#include "Lexical/NativeCode.h"
+#include "Lexical/Source.h"
+#include "Lexical/Type.h"
+#include "Lexical/Method.h"
+#include "Lexical/Interface.h"
+#include "Lexical/Member.h"
+#include "Lexical/Class.h"
+#include "Lexical/Parameter.h"
+#include "Lexical/Variable.h"
+#include "Lexical/Procedure.h"
+#include "Lexical/TypeDef.h"
+#include "Lexical/Const.h"
+#include "Lexical/Delegate.h"
+#include "Lexical/Meta.h"
+#include "Lexical/DataTable.h"
+#include "Lexical/ObjectModule.h"

trunk/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp

@@ -55 +55 @@
 #include <abdev/ab_common/include/ab_common.h>
 
-#include "../common.h"
-
-#include <option.h>
-
-using namespace ActiveBasic::Common::Lexical;
-
-#include <NativeCode.h>
-#include <Source.h>
-#include <Type.h>
-#include <Method.h>
-#include <Interface.h>
-#include <Member.h>
-#include <Class.h>
-#include <Parameter.h>
-#include <Variable.h>
-#include <Procedure.h>
-#include <TypeDef.h>
-#include <Const.h>
-#include <Delegate.h>
-#include <Enum.h>
-#include <Meta.h>
-#include <DataTable.h>
-#include <ObjectModule.h>
-
 
 void ObjectModule::StaticLink( ObjectModule &objectModule )

trunk/ab5.0/abdev/ab_common/src/Lexical/Symbol.cpp

@@ -4 +4 @@
 
 const NamespaceSupporter *Symbol::namespaceSupporter = NULL;
+
+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 )
+    {
+        throw;
+    }
+
+    lstrcpy( name, calcNames[idCalc] );
+}
+
+std::string ActiveBasic::Common::Lexical::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;
+}
+
+BYTE ToCalcId( const char *name )
+{
+    InitCalcNames();
+
+    for( int i=0; i<255; i++ )
+    {
+        if( calcNames[i] )
+        {
+            if( lstrcmp( name, calcNames[i] ) == 0 )
+            {
+                return i;
+            }
+        }
+    }
+
+    throw;
+}
+
+std::string ActiveBasic::Common::Lexical::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 Symbol::GetFullName() const