Changeset 206 in dev for trunk/abdev/BasicCompiler_Common/Object.cpp

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

• trunk/abdev/BasicCompiler_Common/Object.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/Object.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <Compiler.h>
 
@@ -11 +13 @@
 extern HANDLE hHeap;
 
-void CallConstructor( const char *ObjectName,const int *SubScripts,const Type &type,const char *Parameter){
+void CallConstructor( const char *ObjectName,const Subscripts &subscripts,const Type &type,const char *Parameter){
     if( !type.IsObject() ){
         return;
@@ -21 +23 @@
     /////////////////////////////////////
 
-    UserProc *pUserProc;
-    pUserProc=GetMethodHash(ObjectName,type.GetClass().GetName().c_str(),Parameter);
+    const UserProc *pUserProc = GetMethodHash(ObjectName,type.GetClass().GetName().c_str(),Parameter);
     if(!pUserProc){
         if(Parameter[0]) SetError(113,type.GetClass().GetName().c_str(),cp);
@@ -31 +32 @@
     char temporary[VN_SIZE];
 
-    if(SubScripts[0]!=-1){
+    if( subscripts.size() > 0 ){
         int ss[MAX_ARRAYDIM];
         memset(ss,0,MAX_ARRAYDIM*sizeof(int));
         while(1){
             int i3;
-            for(i3=0;;i3++){
-                if(SubScripts[i3]==-1) break;
-
-                if(ss[i3]>SubScripts[i3]){
+            for(i3=0; i3<(int)subscripts.size(); i3++){
+                if(ss[i3]>subscripts[i3]){
                     ss[i3]=0;
                     ss[i3+1]++;
@@ -45 +44 @@
                 else break;
             }
-            if(SubScripts[i3]==-1) break;
+            if( i3 == subscripts.size() )
+            {
+                break;
+            }
             sprintf(temporary,"%s[%d",ObjectName,ss[0]);
-            for(i3=1;;i3++){
-                if(SubScripts[i3]==-1) break;
-
+            for(i3=1; i3<(int)subscripts.size(); i3++){
                 sprintf(temporary+lstrlen(temporary),",%d",ss[i3]);
             }