Changeset 821 in dev for branches/egtra/ab5.0/abdev/ab_common

Timestamp:

Aug 7, 2011, 11:13:15 PM (13 years ago)

Author:

イグトランス (egtra)

Message:

単体テスト周りの修正

Location:

branches/egtra/ab5.0/abdev/ab_common

Files:

• ab_common.vcxproj (modified) (1 diff)
• ab_common.vcxproj.filters (modified) (1 diff)
• include/BasicFixed.h (modified) (1 diff)
• include/Lexical/Symbol.h (modified) (1 diff)
• include/libs.h (modified) (2 diffs)
• src/Lexical/Type.cpp (modified) (1 diff)
• src/Lexical/TypeDef.cpp (modified) (1 diff)

branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj

@@ -177 +177 @@
     </ClCompile>
     <ClCompile Include="src\Lexical\Source.cpp" />
-    <ClCompile Include="src\Lexical\TypeDef.cpp" />
     <ClCompile Include="src\Lexical\Variable.cpp" />
     <ClCompile Include="src\ResourceManager\ResourceManager.cpp" />

branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj.filters

@@ -53 +53 @@
     </ClCompile>
     <ClCompile Include="src\Lexical\Source.cpp">
-      <Filter>Source Files\Lexical</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Lexical\TypeDef.cpp">
       <Filter>Source Files\Lexical</Filter>
     </ClCompile>

branches/egtra/ab5.0/abdev/ab_common/include/BasicFixed.h

@@ -129 +129 @@
 
 //オブジェクト指向エスケープシーケンス
-#define ESC_CLASS           (char)0xA0
-#define ESC_ENDCLASS        (char)0xA1
-#define ESC_ABSTRACT        (char)0xA2
-#define ESC_VIRTUAL         (char)0xA3
-#define ESC_OVERRIDE        (char)0xA4
-#define ESC_INHERITS        (char)0xA5
-#define ESC_ENUM            (char)0xA6
-#define ESC_ENDENUM         (char)0xA7
-#define ESC_NEW             (char)0xA8
-#define ESC_INTERFACE       (char)0xA9
-#define ESC_ENDINTERFACE    (char)0xAA
-#define ESC_DELEGATE        (char)0xAB
-#define ESC_IMPLEMENTS      (char)0xAC
-#define ESC_SYSTEM_STATIC_NEW   (char)0xAD
+#define ESC_CLASS           '\xA0'
+#define ESC_ENDCLASS        '\xA1'
+#define ESC_ABSTRACT        '\xA2'
+#define ESC_VIRTUAL         '\xA3'
+#define ESC_OVERRIDE        '\xA4'
+#define ESC_INHERITS        '\xA5'
+#define ESC_ENUM            '\xA6'
+#define ESC_ENDENUM         '\xA7'
+#define ESC_NEW             '\xA8'
+#define ESC_INTERFACE       '\xA9'
+#define ESC_ENDINTERFACE    '\xAA'
+#define ESC_DELEGATE        '\xAB'
+#define ESC_IMPLEMENTS      '\xAC'
+#define ESC_SYSTEM_STATIC_NEW   '\xAD'

branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Symbol.h

@@ -38 +38 @@
 
 public:
-    Symbol( const NamespaceScopes &namespaceScopes, const std::string &name )
-        : namespaceScopes( namespaceScopes )
-        , name( name )
+    Symbol(NamespaceScopes namespaceScopes, std::string name)
+        : namespaceScopes(std::move(namespaceScopes))
+        , name(std::move(name))
     {
     }
-    Symbol( const Symbol &symbol )
-        : namespaceScopes( symbol.namespaceScopes )
-        , name( symbol.name )
+    Symbol(const Symbol &symbol)
+        : namespaceScopes(symbol.namespaceScopes)
+        , name(symbol.name)
     {
     }

branches/egtra/ab5.0/abdev/ab_common/include/libs.h

@@ -11 +11 @@
 #define lstrcmpiA _stricmp
 
+#if 0
 extern "C"
 {
@@ -23 +24 @@
 #define malloc dlmalloc
 #define realloc dlrealloc
+#endif

branches/egtra/ab5.0/abdev/ab_common/src/Lexical/Type.cpp

@@ -542 +542 @@
 
 int Type::GetBasicTypeFromSimpleName( const char *variable ){
-    extern char DefIntVari[26],DefSngVari[26],DefStrVari[26],divNum,dsvNum,dStrvNum;
+    assert(variable != nullptr);
+    auto length = std::strlen(variable);
+    assert(length > 0);
+
     int i;
     char name[VN_SIZE];
 
     //構造体メンバの場合を考慮
-    for(i=lstrlen(variable);i>0;i--){
+    for(i=length;i>0;i--){
         if(variable[i]=='.'){
             i++;

branches/egtra/ab5.0/abdev/ab_common/src/Lexical/TypeDef.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+#include <jenga/include/jenga.h>
+#include <abdev/ab_common/include/ab_common.h>
 
 TypeDef::TypeDef( const Symbol &symbol, const std::string &baseName, const Type &baseType )