Changeset 402 in dev for trunk

Timestamp:

Feb 28, 2008, 7:04:35 PM (17 years ago)

Author:

dai_9181

Message:

UserProc::SetParamsAndReturnTypeメソッドをリファクタリング
LexicalAnalysis.hのインクルードを除去した

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Calc.cpp (modified) (1 diff)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler32/OperatorProc.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Calc.cpp (modified) (1 diff)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler64/NumOpe.cpp (modified) (1 diff)
• BasicCompiler64/OperatorProc.cpp (modified) (1 diff)
• BasicCompiler_Common/Compile.cpp (modified) (1 diff)
• BasicCompiler_Common/Enum.cpp (modified) (1 diff)
• BasicCompiler_Common/Intermediate_Step1.cpp (modified) (1 diff)
• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (1 diff)
• BasicCompiler_Common/Resource.cpp (modified) (1 diff)
• BasicCompiler_Common/StrOperation.cpp (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• BasicCompiler_Common/VariableOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/VariableOpe.h (modified) (1 diff)
• BasicCompiler_Common/calculation.cpp (modified) (1 diff)
• BasicCompiler_Common/error.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Parameter.h (modified) (1 diff)
• BasicCompiler_Common/include/Symbol.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Class_Collect.cpp (modified) (1 diff)
• BasicCompiler_Common/src/NamespaceSupporter.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Procedure.cpp (modified) (9 diffs)
• BasicCompiler_Common/src/Source.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Symbol.cpp (modified) (1 diff)
• BasicCompiler_Common/src/TypeDef.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Calc.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Program.h>

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <LexicalScope.h>

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <LexicalScope.h>

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler32/OperatorProc.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler64/Compile_Calc.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
-
 #include <Compiler.h>
 

trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Program.h>

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <CodeGenerator.h>

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler64/OperatorProc.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 #include <jenga/include/smoothie/SmoothieException.h>
 

trunk/abdev/BasicCompiler_Common/Enum.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/Resource.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Type.h>

trunk/abdev/BasicCompiler_Common/StrOperation.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Source.h>

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/Smoothie.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/VariableOpe.h

@@ -1 +1 @@
 #pragma once
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 class Type;

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/error.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Program.h>

trunk/abdev/BasicCompiler_Common/include/Parameter.h

@@ -5 +5 @@
 
 #include <jenga/include/smoothie/BasicFixed.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <option.h>

trunk/abdev/BasicCompiler_Common/include/Symbol.h

@@ -3 +3 @@
 #include <vector>
 #include <string>
-
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <BoostSerializationSupport.h>

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/SmoothieException.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Source.h>

trunk/abdev/BasicCompiler_Common/src/Class_Collect.cpp

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/SmoothieException.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Source.h>

trunk/abdev/BasicCompiler_Common/src/NamespaceSupporter.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/SmoothieException.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/SmoothieException.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>
@@ -100 +99 @@
     if(sourceOfParams[i]!='('){
         SetError(1,NULL,nowLine);
-        return 0;
-    }
-    i++;
-    if(sourceOfParams[i]!=')'&& this->pParentClass ){
+        return false;
+    }
+    if(sourceOfParams[i + 1]!=')'&& this->pParentClass ){
         //クラスのメンバ関数の場合のみ、デストラクタにパラメータがある場合にエラーをだす
         if(this->GetName()[0]=='~'){
-            SmoothieException::Throw(114,NULL,nowLine);
-            i=JumpStringInPare(sourceOfParams,i);
-        }
-    }
-
-    /*
-    GetStringInPare( temporary, sourceOfParams + i );
-    RemoveStringPare( temporary );
-    */
-
-    while(1){
-        if(sourceOfParams[i]==')') break;
-
-        //ByRef
-        bool isRef;
-        if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_BYVAL){
-            isRef = false;
-            i+=2;
-        }
-        else if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_BYREF){
-            isRef = true;
-            i+=2;
-        }
-        else isRef = false;
+            SetError(114,NULL,nowLine);
+            return false;
+        }
+    }
+
+    // カッコ内のパラメータ文字列を取得
+    char parametersStr1[8192];
+    char parametersStr2[8192] = "";
+    i += GetStringInPare( parametersStr1, sourceOfParams + i, true );
+    if( sourceOfParams[i] == '(' )
+    {
+        i += GetStringInPare( parametersStr2, sourceOfParams + i, true );
+    }
+
+    // 戻り値文字列を取得
+    char returnTypeStr[VN_SIZE] = "";
+    if( sourceOfParams[i] )
+    {
+        if( sourceOfParams[i] == 1 && sourceOfParams[i+1] == ESC_AS )
+        {
+            if( !this->IsFunction() ){
+                // Sub/Macroの場合
+                SetError(38,this->GetName(),nowLine);
+            }
+
+            lstrcpy( returnTypeStr, sourceOfParams + i + 2 );
+        }
+        else
+        {
+            SetError(1,NULL,nowLine);
+            return false;
+        }
+    }
+
+    // パラメータを分割
+    Jenga::Common::Strings parameters;
+    SplitParameter( parametersStr1, parameters );
+    BOOST_FOREACH( const std::string &paramStr, parameters )
+    {
+        int i = 0;
+
+        bool isRef = false;
+        if( paramStr[i] == 1 )
+        {
+            if( paramStr[i+1] == ESC_BYVAL )
+            {
+                isRef = false;
+                i += 2;
+            }
+            else if( paramStr[i+1] == ESC_BYREF )
+            {
+                isRef = true;
+                i += 2;
+            }
+        }
 
         //パラメータ名
@@ -137 +166 @@
         sw=0;
         for(i2=0;;i++,i2++){
-            if(sourceOfParams[i]=='('){
+            if(paramStr[i]=='('){
                 if(!sw) sw=1;
 
-                i3=GetStringInPare(name+i2,sourceOfParams+i);
+                i3=GetStringInPare(name+i2,paramStr.c_str()+i);
                 i2+=i3-1;
                 i+=i3-1;
                 continue;
             }
-            if(sourceOfParams[i]=='['){
+            if(paramStr[i]=='['){
                 if(!sw) sw=1;
 
-                i3=GetStringInBracket(name+i2,sourceOfParams+i);
+                i3=GetStringInBracket(name+i2,paramStr.c_str()+i);
                 i2+=i3-1;
                 i+=i3-1;
                 continue;
             }
-            if(!IsVariableChar(sourceOfParams[i])){
+            if(!IsVariableChar(paramStr[i])){
                 name[i2]=0;
                 break;
             }
-            name[i2]=sourceOfParams[i];
+            name[i2]=paramStr[i];
         }
         if(sw){
             //配列パラメータ
-            if( isRef == false ) SmoothieException::Throw(29,NULL,nowLine);
+            if( isRef == false )
+            {
+                SetError(29,NULL,nowLine);
+            }
             isArray = true;
 
@@ -181 +213 @@
         Type type( DEF_NON );
         char initValue[8192] = "";
-        if( sourceOfParams[i] == '=' ){
+        if( paramStr[i] == '=' ){
             i++;
-            i = GetOneParameter( sourceOfParams, i, initValue );
-            if( sourceOfParams[i-1] == ',' )
+            i = GetOneParameter( paramStr.c_str(), i, initValue );
+            if( paramStr[i-1] == ',' )
             {
                 i--;
@@ -199 +231 @@
             }
         }
-        else if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_AS){
+        else if(paramStr[i]==1&&paramStr[i+1]==ESC_AS){
             // As指定
             i+=2;
 
             i2=0;
-            while(sourceOfParams[i]=='*'){
-                temporary[i2]=sourceOfParams[i];
+            while(paramStr[i]=='*'){
+                temporary[i2]=paramStr[i];
                 i++;
                 i2++;
             }
             for(;;i++,i2++){
-                if(!IsVariableChar(sourceOfParams[i])){
-                    if(sourceOfParams[i]==1&&(sourceOfParams[i+1]==ESC_FUNCTION||sourceOfParams[i+1]==ESC_SUB)){
-                        temporary[i2++]=sourceOfParams[i++];
-                        temporary[i2]=sourceOfParams[i];
+                if(!IsVariableChar(paramStr[i])){
+                    if(paramStr[i]==1&&(paramStr[i+1]==ESC_FUNCTION||paramStr[i+1]==ESC_SUB)){
+                        temporary[i2++]=paramStr[i++];
+                        temporary[i2]=paramStr[i];
                         continue;
                     }
@@ -219 +251 @@
                     break;
                 }
-                temporary[i2]=sourceOfParams[i];
+                temporary[i2]=paramStr[i];
             }
 
@@ -248 +280 @@
         //パラメータを追加
         this->params.push_back( pParam );
-
-        if(sourceOfParams[i]==','){
+    }
+
+    this->secondParmNum = (int)this->params.size();
+
+    SplitParameter( parametersStr2, parameters );
+    BOOST_FOREACH( const std::string &paramStr, parameters )
+    {
+        int i = 0;
+
+        bool isRef = false;
+        if( paramStr[i] == 1 )
+        {
+            if( paramStr[i+1] == ESC_BYVAL )
+            {
+                isRef = true;
+                i += 2;
+            }
+            else if( paramStr[i+1] == ESC_BYREF )
+            {
+                isRef = false;
+                i += 2;
+            }
+        }
+
+        //パラメータ名
+        bool isArray = false;
+        Subscripts subscripts;
+        char name[VN_SIZE];
+        sw=0;
+        for(i2=0;;i++,i2++){
+            if(paramStr[i]=='('){
+                if(!sw) sw=1;
+
+                i3=GetStringInPare(name+i2,paramStr.c_str()+i);
+                i2+=i3-1;
+                i+=i3-1;
+                continue;
+            }
+            if(paramStr[i]=='['){
+                if(!sw) sw=1;
+
+                i3=GetStringInBracket(name+i2,paramStr.c_str()+i);
+                i2+=i3-1;
+                i+=i3-1;
+                continue;
+            }
+            if(!IsVariableChar(paramStr[i])){
+                name[i2]=0;
+                break;
+            }
+            name[i2]=paramStr[i];
+        }
+        if(sw){
+            //配列パラメータ
+            if( isRef == false ) SmoothieException::Throw(29,NULL,nowLine);
+            isArray = true;
+
+            if((name[i2-2]=='('&&name[i2-1]==')')||
+                (name[i2-2]=='['&&name[i2-1]==']'))
+            {
+                subscripts.push_back( LONG_MAX );
+
+                name[i2-2]=0;
+            }
+            else{
+                GetArrange(name,temp2,subscripts);
+                lstrcpy(name,temp2);
+            }
+
+            i2=lstrlen(name);
+        }
+
+        Type type( DEF_NON );
+        char initValue[8192] = "";
+        if( paramStr[i] == '=' ){
             i++;
-            continue;
-        }
-        else if(sourceOfParams[i]==')') continue;
-        else{
-            SetError(1,NULL,nowLine);
-            break;
-        }
-    }
-    this->secondParmNum = (int)this->params.size();
-    i++;
-    if(sourceOfParams[i]=='('){
-        i++;
-        while(1){
-            if(sourceOfParams[i]==')') break;
-
-            //ByRef
-            bool isRef;
-            if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_BYVAL){
-                isRef = false;
-                i+=2;
-            }
-            else if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_BYREF){
-                isRef = true;
-                i+=2;
-            }
-            else isRef = false;
-
-            //パラメータ名
-            bool isArray = false;
-            Subscripts subscripts;
-            char name[VN_SIZE];
-            sw=0;
-            for(i2=0;;i++,i2++){
-                if(sourceOfParams[i]=='('){
-                    if(!sw) sw=1;
-
-                    i3=GetStringInPare(name+i2,sourceOfParams+i);
-                    i2+=i3-1;
-                    i+=i3-1;
-                    continue;
-                }
-                if(sourceOfParams[i]=='['){
-                    if(!sw) sw=1;
-
-                    i3=GetStringInBracket(name+i2,sourceOfParams+i);
-                    i2+=i3-1;
-                    i+=i3-1;
-                    continue;
-                }
-                if(!IsVariableChar(sourceOfParams[i])){
-                    name[i2]=0;
+            i = GetOneParameter( paramStr.c_str(), i, initValue );
+            if( paramStr[i-1] == ',' )
+            {
+                i--;
+            }
+
+            // TODO: エラー用 fix me!!!
+            //cp = nowLine;
+
+            NumOpe_GetType( initValue, GetStringTypeInfo(), type );
+            
+            if( IS_LITERAL(type.GetIndex()) )
+            {
+                type.SetIndex( -1 );
+            }
+        }
+        else if(paramStr[i]==1&&paramStr[i+1]==ESC_AS){
+            // As指定
+            i+=2;
+
+            i2=0;
+            while(paramStr[i]=='*'){
+                temporary[i2]=paramStr[i];
+                i++;
+                i2++;
+            }
+            for(;;i++,i2++){
+                if(!IsVariableChar(paramStr[i])){
+                    if(paramStr[i]==1&&(paramStr[i+1]==ESC_FUNCTION||paramStr[i+1]==ESC_SUB)){
+                        temporary[i2++]=paramStr[i++];
+                        temporary[i2]=paramStr[i];
+                        continue;
+                    }
+                    temporary[i2]=0;
                     break;
                 }
-                name[i2]=sourceOfParams[i];
-            }
-            if(sw){
-                //配列パラメータ
-                if( isRef == false ) SmoothieException::Throw(29,NULL,nowLine);
-                isArray = true;
-
-                if((name[i2-2]=='('&&name[i2-1]==')')||
-                    (name[i2-2]=='['&&name[i2-1]==']'))
-                {
-                    subscripts.push_back( LONG_MAX );
-
-                    name[i2-2]=0;
+                temporary[i2]=paramStr[i];
+            }
+
+            compiler.StringToType( temporary, type );
+
+            if( type.IsNull() ){
+                SmoothieException::Throw(3,temporary,nowLine);
+                type.SetBasicType( DEF_PTR_VOID );
+            }
+
+            if( type.IsObject() ){
+                if( type.GetClass().IsBlittableType() ){
+                    // Blittable型のときは基本型として扱う
+                    type = type.GetClass().GetBlittableType();
                 }
-                else{
-                    GetArrange(name,temp2,subscripts);
-                    lstrcpy(name,temp2);
-                }
-
-                i2=lstrlen(name);
-            }
-
-            //型
-            Type type( DEF_NON );
-            if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_AS){
-                i+=2;
-
-                i2=0;
-                while(sourceOfParams[i]=='*'){
-                    temporary[i2]=sourceOfParams[i];
-                    i++;
-                    i2++;
-                }
-                for(;;i++,i2++){
-                    if(!IsVariableChar(sourceOfParams[i])){
-                        if(sourceOfParams[i]==1&&(sourceOfParams[i+1]==ESC_FUNCTION||sourceOfParams[i+1]==ESC_SUB)){
-                            temporary[i2++]=sourceOfParams[i++];
-                            temporary[i2]=sourceOfParams[i];
-                            continue;
-                        }
-                        temporary[i2]=0;
-                        break;
-                    }
-                    temporary[i2]=sourceOfParams[i];
-                }
-
-                compiler.StringToType( temporary, type );
-
-                if( type.IsNull() ){
-                    SmoothieException::Throw(3,temporary,nowLine);
-                    type.SetBasicType( DEF_PTR_VOID );
-                }
-            }
-            else{
-                type.SetBasicType( Type::GetBasicTypeFromSimpleName(temporary) );
-                SmoothieException::Throw(-103,temporary,nowLine);
-            }
-
-            Parameter *pParam = new Parameter( name, type, isRef );
-            if( isArray ){
-                pParam->SetArray( subscripts );
-            }
-
-            //パラメータを追加
-            this->params.push_back( pParam );
-
-            if(sourceOfParams[i]==','){
-                i++;
-                continue;
-            }
-            else if(sourceOfParams[i]==')') continue;
-            else{
-                SetError(1,NULL,nowLine);
-                break;
-            }
-        }
-        i++;
-    }
-
-    if(sourceOfParams[i]){
+            }
+        }
+        else{
+            type.SetBasicType( Type::GetBasicTypeFromSimpleName(temporary) );
+            SmoothieException::Throw(-103,temporary,nowLine);
+        }
+
+        Parameter *pParam = new Parameter( name, type, isRef, initValue );
+        if( isArray ){
+            pParam->SetArray( subscripts );
+        }
+
+        //パラメータを追加
+        this->params.push_back( pParam );
+    }
+
+    if(returnTypeStr[0]){
         ///////////////////
         // 戻り値を取得
@@ -390 +430 @@
         if( !this->IsFunction() ){
             // Sub/Macroの場合
-            SmoothieException::Throw(38,this->GetName(),nowLine);
+            SetError(38,this->GetName(),nowLine);
         }
 
@@ -397 +437 @@
                 this->GetName()[0]=='~'){
                 //クラスのコンストラクタ、デストラクタがFunction定義の場合はエラーをだす
-                SmoothieException::Throw(115,NULL,nowLine);
-            }
-        }
-
-
-        i2=lstrlen(sourceOfParams)-2;
-
-        int sw_as=0;
-        for(;i2>0;i2--){
-            if(sourceOfParams[i2]==')') break;
-
-            if(sourceOfParams[i2]==1&&sourceOfParams[i2+1]==ESC_AS){
-                i2+=2;
-                i3=0;
-                while(sourceOfParams[i2]=='*') temporary[i3++]=sourceOfParams[i2++];
-                for(;;i2++,i3++){
-                    if( IsCommandDelimitation( sourceOfParams[i2] ) )
-                    {
-                        temporary[i3]=0;
-                        break;
-                    }
-                    temporary[i3]=sourceOfParams[i2];
-                }
-                compiler.StringToType( temporary, this->returnType );
-                if( this->returnType.IsNull() ) SmoothieException::Throw(3,temporary,nowLine);
-
-                sw_as=1;
-                break;
-            }
-        }
-
-        if(!sw_as){
-            SmoothieException::Throw(-104,this->GetName().c_str(),nowLine);
+                SetError(115,NULL,nowLine);
+            }
+        }
+
+        compiler.StringToType( returnTypeStr, this->returnType );
+        if( this->returnType.IsNull() )
+        {
+            SetError(3,returnTypeStr,nowLine);
+        }
+    }
+    else{
+        if( this->IsFunction() )
+        {
+            // Function定義なのに、戻り値の型がセットされていない
+            SetError(-104,this->GetName().c_str(),nowLine);
 
             this->returnType.SetBasicType( DEF_DOUBLE );
         }
-    }
-    else{
-        //戻り値なしのSub定義
-        this->returnType.SetNull();
+        else
+        {
+            //戻り値なしのSub定義
+            this->returnType.SetNull();
+        }
     }
 

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -8 +8 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/BasicFixed.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 #include <jenga/include/smoothie/SmoothieException.h>
 

trunk/abdev/BasicCompiler_Common/src/Symbol.cpp

@@ -2 +2 @@
 
 #include <jenga/include/smoothie/BasicFixed.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <Compiler.h>

trunk/abdev/BasicCompiler_Common/src/TypeDef.cpp

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/SmoothieException.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <TypeDef.h>