Changeset 173 in dev for trunk/jenga/src

Timestamp:

Jun 20, 2007, 3:38:44 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/jenga/src/smoothie

Files:

• Class.cpp (modified) (2 diffs)
• LexicalAnalysis.cpp (added)
• Namespace.cpp (modified) (1 diff)
• Procedure.cpp (added)
• Source.cpp (modified) (3 diffs)
• Type.cpp (modified) (4 diffs)
• TypeDef.cpp (added)
• Variable.cpp (added)

trunk/jenga/src/smoothie/Class.cpp

@@ -669 +669 @@
     iIteNextNum( 0 )
 {
-    memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) );
+    Clear();
 }
 Classes::~Classes(){
+    Clear();
+}
+void Classes::Clear()
+{
     int i;
     for(i=0;i<MAX_CLASS_HASH;i++){
@@ -678 +682 @@
 
     if(ppobj_IteClass) free(ppobj_IteClass);
+    memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) );
 }
 

trunk/jenga/src/smoothie/Namespace.cpp

@@ -129 +129 @@
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
             for(i+=2,i2=0;;i2++,i++){
-                if( BasicSource::IsCommandDelimitation( source[i] ) ){
+                if( IsCommandDelimitation( source[i] ) ){
                     temporary[i2]=0;
                     break;

trunk/jenga/src/smoothie/Source.cpp

@@ -5 +5 @@
 #include <jenga/include/smoothie/BasicFixed.h>
 #include <jenga/include/smoothie/Source.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
 #include <jenga/include/smoothie/SmoothieException.h>
 
@@ -874 +875 @@
                 i++;
             }
-            while( Text::IsBlank( buffer[i] ) ){
+            while( IsBlank( buffer[i] ) ){
                 i++;
             }
@@ -882 +883 @@
             if( memicmp( buffer + i, generateDirectiveName.c_str(), generateDirectiveName.size() ) == 0 ){
                 i += (int)generateDirectiveName.size();
-                while( Text::IsBlank( buffer[i] ) ){
+                while( IsBlank( buffer[i] ) ){
                     i++;
                 }

trunk/jenga/src/smoothie/Type.cpp

@@ -93 +93 @@
     // Object型だったとき
     if( typeName == "Object" ){
-        type.SetType( DEF_OBJECT, pobj_DBClass->GetObjectClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::meta.classes.GetObjectClassPtr() );
         return true;
     }
@@ -99 +99 @@
     // String型だったとき
     if( typeName == "String" ){
-        type.SetType( DEF_OBJECT, pobj_DBClass->GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::meta.classes.GetStringClassPtr() );
         return true;
     }
@@ -114 +114 @@
 
     //クラス
-    const CClass *pobj_c = pobj_DBClass->Find( typeName );
+    const CClass *pobj_c = Smoothie::meta.classes.Find( typeName );
     if(pobj_c){
         type.pClass = pobj_c;
@@ -539 +539 @@
 
 Type Type::String(){
-    return Type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() );
+    return Type( DEF_OBJECT, *Smoothie::meta.classes.GetStringClassPtr() );
 }*/
 
+int Type::GetBasicTypeFromSimpleName( const char *variable ){
+    extern char DefIntVari[26],DefSngVari[26],DefStrVari[26],divNum,dsvNum,dStrvNum;
+    int i;
+    char name[VN_SIZE];
+
+    //構造体メンバの場合を考慮
+    for(i=lstrlen(variable);i>0;i--){
+        if(variable[i]=='.'){
+            i++;
+            break;
+        }
+    }
+
+    for(;;i++){
+        if(variable[i]=='('||variable[i]=='\0'){
+            name[i]=0;
+            break;
+        }
+        name[i]=variable[i];
+    }
+    //変数名から選択
+    i--;
+    if(name[i]=='#') return DEF_DOUBLE;
+    if(name[i]=='!') return DEF_SINGLE;
+    if(name[i]=='%') return DEF_INTEGER;
+    return DEF_DOUBLE;
+}
+
+
 const string BlittableType::GetCreateStaticMethodFullName() const
 {