Changeset 183 in dev for trunk/abdev/BasicCompiler32/Compile_Calc.cpp

Timestamp:

Jun 24, 2007, 6:50:40 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler32/Compile_Calc.cpp (modified) (8 diffs)

trunk/abdev/BasicCompiler32/Compile_Calc.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -78 +81 @@
             //符号あり
 
-            if(OldType==DEF_INTEGER || (isUnicode&&OldType==DEF_CHAR)){
+            if(OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -90 +93 @@
                 op_push(REG_EAX);
             }
-            else if(OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)){
+            else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -170 +173 @@
             //符号あり
 
-            if(OldType==DEF_INTEGER || (isUnicode&&OldType==DEF_CHAR)){
+            if(OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -182 +185 @@
                 op_push(REG_EAX);
             }
-            else if(OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)){
+            else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
                 //pop eax
                 op_pop(REG_EAX);
@@ -304 +307 @@
     if(OldType==DEF_BOOLEAN||
         OldType==DEF_BYTE||
-        OldType==DEF_WORD||OldType==DEF_INTEGER || (isUnicode&&OldType==DEF_CHAR)) return;
-    else if(OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)){
+        OldType==DEF_WORD||OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)) return;
+    else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
         //pop eax
         op_pop(REG_EAX);
@@ -334 +337 @@
 void ChangeTypeToByte(int OldType){
     //現在のスタックの内容をbyte型に変換する
-    if(OldType==DEF_BYTE||OldType==DEF_SBYTE || (isUnicode==false&&OldType==DEF_CHAR)) return;
+    if(OldType==DEF_BYTE||OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)) return;
 
     ChangeTypeToLong(OldType);
@@ -619 +622 @@
 
 
-    if( varType.IsObject() && Smoothie::meta.blittableTypes.IsExist( calcType ) ){
+    if( varType.IsObject() && Smoothie::GetMeta().blittableTypes.IsExist( calcType ) ){
         // Blittable型をオブジェクトとして扱う
         vector<UserProc *> userProcs;
-        Smoothie::meta.blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
+        Smoothie::GetMeta().blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
         if( userProcs.size() != 1 ){
             SetError();