Changeset 600 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

May 10, 2008, 8:50:41 PM (17 years ago)

Author:

dai_9181

Message:

依存関係を整理中

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• BasicFixed.h (modified) (1 diff)
• NumOpe_GetType.cpp (modified) (1 diff)
• include/Const.h (modified) (2 diffs)
• src/BoostSerializationSupport.cpp (modified) (1 diff)
• src/Const.cpp (modified) (3 diffs)
• src/LexicalAnalyzer_Const.cpp (modified) (1 diff)
• src/ObjectModule.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/BasicFixed.h

@@ -3 +3 @@
 
 #define MAX_ARRAYDIM    16
-#define VN_SIZE         1024
 #define MAX_LEN         65535
 

trunk/ab5.0/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -850 +850 @@
                     );
                     if(i3){
-                        if( compiler.GetObjectModule().meta.GetGlobalConsts().IsStringPtr( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ) ) ){
+                        if( compiler.GetObjectModule().meta.GetGlobalConsts().IsStringPtr( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ), compiler.IsUnicode() ) )
+                        {
                             //リテラル文字列
                             goto StrLiteral;

trunk/ab5.0/abdev/BasicCompiler_Common/include/Const.h

@@ -69 +69 @@
 public:
 
-    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *Expression);
+    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, _int64 i64data, const Type &type );
     void Add( const NamespaceScopes &namespaceScopes, const std::string &name, int value);
 
@@ -79 +79 @@
     _int64 GetWholeData( const Symbol &symbol );
     double GetDoubleData( const Symbol &symbol );
-    bool IsStringPtr( const Symbol &symbol );
+    bool IsStringPtr( const Symbol &symbol, bool isUnicode );
 };
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -44 +44 @@
 
 #include <jenga/include/jenga.h>
+#include <abdev/ab_common/include/ab_common.h>
 
 #include "../common.h"

trunk/ab5.0/abdev/BasicCompiler_Common/src/Const.cpp

@@ -7 +7 @@
 }
 
-void Consts::Add( const NamespaceScopes &namespaceScopes, const std::string &name , const char *Expression)
+void Consts::Add( const NamespaceScopes &namespaceScopes, const std::string &name, _int64 i64data, const Type &type )
 {
-    _int64 i64data;
-    Type resultType;
-    if( !StaticCalculation(false, Expression, 0, &i64data, resultType) ){
-        //変数の場合
-        //何もしない（実行領域コンパイル時にdim宣言として扱う）
-        return;
-    }
-
-    //リテラル値の場合
-    //登録を行う
-
-    CConst *newconst = new CConst(namespaceScopes, name, resultType, i64data);
+    CConst *newconst = new CConst(namespaceScopes, name, type, i64data);
 
     //ハッシュリストに追加
@@ -69 +58 @@
     return pConst->GetDoubleData();
 }
-bool Consts::IsStringPtr( const Symbol &symbol ){
+bool Consts::IsStringPtr( const Symbol &symbol, bool isUnicode ){
     CConst *pConst = GetObjectPtr( symbol );
 
@@ -76 +65 @@
     const Type &type = pConst->GetType();
 
-    return ( type.GetBasicType() == typeOfPtrChar && type.GetIndex() == LITERAL_STRING );
+    int charType = isUnicode
+        ? MAKE_PTR_TYPE(DEF_WORD,1)
+        : MAKE_PTR_TYPE(DEF_SBYTE,1);
+
+    return ( type.GetBasicType() == charType && type.GetIndex() == LITERAL_STRING );
 }
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp

@@ -173 +173 @@
                     // 定数
                     const char *expression = temporary + i2 + 1;
-                    consts.Add( namespaceScopes, name, expression );
+
+                    _int64 i64data;
+                    Type resultType;
+                    if( StaticCalculation(false, expression, 0, &i64data, resultType) )
+                    {
+                        consts.Add( namespaceScopes, name, i64data, resultType );
+                    }
                 }
                 else

trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -53 +53 @@
 
 #include <jenga/include/jenga.h>
+#include <abdev/ab_common/include/ab_common.h>
 
 #include "../common.h"
@@ -58 +59 @@
 
 #include <option.h>
-
-#include <abdev/ab_common/include/ab_common.h>
 
 using namespace ActiveBasic::Common::Lexical;