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

Timestamp:

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

Author:

イグトランス (egtra)

Message:

単体テスト周りの修正

Location:

branches/egtra/ab5.0/abdev

Files:

• BasicCompiler_Common/StrOperation.cpp (modified) (1 diff)
• BasicCompiler_Common/StrOperation.h (modified) (1 diff)
• ab-test/Type.cpp (modified) (1 diff)
• ab-test/ab-test.cpp (modified) (1 diff)
• ab-test/stdafx.h (modified) (1 diff)
• ab_common/ab_common.vcxproj (modified) (1 diff)
• ab_common/ab_common.vcxproj.filters (modified) (1 diff)
• ab_common/include/BasicFixed.h (modified) (1 diff)
• ab_common/include/Lexical/Symbol.h (modified) (1 diff)
• ab_common/include/libs.h (modified) (2 diffs)
• ab_common/src/Lexical/Type.cpp (modified) (1 diff)
• ab_common/src/Lexical/TypeDef.cpp (modified) (1 diff)
• compiler-impl/compiler-impl.vcxproj (modified) (1 diff)
• compiler-impl/compiler-impl.vcxproj.filters (modified) (1 diff)
• compiler.vcxproj (modified) (1 diff)
• compiler.vcxproj.filters (modified) (1 diff)

branches/egtra/ab5.0/abdev/BasicCompiler_Common/StrOperation.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+#include <abdev/ab_common/include/ab_common.h>
+#include "StrOperation.h"
+#include "common.h"
 
 void KillSpaces(char const *str1,char *str2){

branches/egtra/ab5.0/abdev/BasicCompiler_Common/StrOperation.h

@@ +1 @@
+#pragma once
 
 enum ReferenceKind

branches/egtra/ab5.0/abdev/ab-test/Type.cpp

@@ -22 +22 @@
     Type::StringToBasicType("Long", basicType);
     BOOST_CHECK_EQUAL(basicType, DEF_LONG);
+
+    BOOST_CHECK_EQUAL(Type::GetBasicTypeFromSimpleName("a%"), DEF_INTEGER);
 }

branches/egtra/ab5.0/abdev/ab-test/ab-test.cpp

@@ -94 +94 @@
     ::GetModuleFileName(nullptr, moduleName, MAX_PATH);
 
-    auto systemDir = fs::path(moduleName).parent_path().parent_path() / L"build/release/system";
+    auto systemDir = fs::path(moduleName).parent_path().parent_path().parent_path() / L"build/release/system";
 
     UniqueHModule hmodRes(::LoadLibraryExW((systemDir / name).wstring().c_str(), nullptr, LOAD_LIBRARY_AS_DATAFILE));

branches/egtra/ab5.0/abdev/ab-test/stdafx.h

@@ -4 +4 @@
 
 #define BOOST_FILESYSTEM_VERSION 3
-#define BOOST_FILESYSTEM_NO_DEPRECATED
 
 #include <memory>

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 )

branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj

@@ -136 +136 @@
     <ClCompile Include="..\ab_common\src\Lexical\Template.cpp" />
     <ClCompile Include="..\ab_common\src\Lexical\Type.cpp" />
+    <ClCompile Include="..\ab_common\src\Lexical\TypeDef.cpp" />
     <ClCompile Include="..\BasicCompiler_Common\src\LexicalAnalyzer_TypeDef.cpp" />
+    <ClCompile Include="..\BasicCompiler_Common\StrOperation.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj.filters

@@ -72 +72 @@
       <Filter>ab-common\Lexical</Filter>
     </ClCompile>
+    <ClCompile Include="..\BasicCompiler_Common\StrOperation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ab_common\src\Lexical\TypeDef.cpp">
+      <Filter>ab-common\Lexical</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

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

@@ -315 +315 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="BasicCompiler_Common\StrOperation.cpp">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="BasicCompiler_Common\CommandFormat.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

@@ -152 +152 @@
     </ClCompile>
     <ClCompile Include="BasicCompiler_Common\RSrcSection.cpp">
-      <Filter>Source Files\32及び64共通</Filter>
-    </ClCompile>
-    <ClCompile Include="BasicCompiler_Common\StrOperation.cpp">
       <Filter>Source Files\32及び64共通</Filter>
     </ClCompile>