Changeset 173 in dev

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/jenga

Files:

• include/smoothie/Class.h (modified) (4 diffs)
• include/smoothie/LexicalAnalysis.h (added)
• include/smoothie/Source.h (modified) (3 diffs)
• include/smoothie/Type.h (modified) (1 diff)
• include/smoothie/TypeDef.h (modified) (2 diffs)
• include/smoothie/Variable.h (modified) (1 diff)
• projects/smoothie/smoothie.vcproj (modified) (4 diffs)
• src/smoothie/Class.cpp (modified) (2 diffs)
• src/smoothie/LexicalAnalysis.cpp (added)
• src/smoothie/Namespace.cpp (modified) (1 diff)
• src/smoothie/Procedure.cpp (added)
• src/smoothie/Source.cpp (modified) (3 diffs)
• src/smoothie/Type.cpp (modified) (4 diffs)
• src/smoothie/TypeDef.cpp (added)
• src/smoothie/Variable.cpp (added)

trunk/jenga/include/smoothie/Class.h

@@ -4 +4 @@
 #include "Member.h"
 #include "Method.h"
+#include "LexicalAnalysis.h"
 
 class InheritedInterface
@@ -120 +121 @@
     bool IsDelegate() const;
     bool IsStructure() const;
+    void SetClassType( ClassType classType )
+    {
+        this->classType = classType;
+    }
 
     //継承させる
@@ -248 +253 @@
         for( int i=0; desc[i]; i++ ){
             if( desc[i] == '(' ){
-                i=BasicSource::JumpStringInPare(desc,i+1);
+                i=JumpStringInPare(desc,i+1);
                 continue;
             }
             else if( desc[i] == '[' ){
-                i=BasicSource::JumpStringInBracket(desc,i+1);
+                i=JumpStringInBracket(desc,i+1);
                 continue;
             }
@@ -296 +301 @@
     Classes();
     ~Classes();
+    void Clear();
 
     const CClass *Find( const string &fullName ) const;

trunk/jenga/include/smoothie/Source.h

@@ -34 +34 @@
     bool ReadFile( const string &filePath );
 
-    static bool IsBlank( char c )
-    {
-        if( c == ' ' || c == '\t' )
-        {
-            return true;
-        }
-        return false;
-    }
     static void Text::SlideString(char *buffer, int slide){
         char *temp;
@@ -82 +74 @@
         return buffer+2;
     }
-    int GetLength(){
+    const char *GetBuffer() const
+    {
+        return buffer+2;
+    }
+    int GetLength() const
+    {
         return length-2;
     }
@@ -99 +96 @@
     }
 
-    static bool IsCommandDelimitation( char c ){
-        if( c == '\n' || c == ':' || c == '\0' ){
-            return true;
+    char operator[]( int index ) const
+    {
+        if( index>GetLength() )
+        {
+            throw "bad access";
         }
-
-        return false;
-    }
-
-    static int JumpStringInPare(const char *buffer,int pos){
-        int PareNum;
-        for(PareNum=1;;pos++){
-            if(buffer[pos]=='\"'){
-                for(pos++;;pos++){
-                    if(buffer[pos]=='\"') break;
-                }
-                continue;
-            }
-            else if(buffer[pos]=='(') PareNum++;
-            else if(buffer[pos]==')'){
-                PareNum--;
-                if(PareNum==0) return pos;
-            }
-            else if(buffer[pos]=='\0') break;
-        }
-        return 0;
-    }
-    static int JumpStringInBracket(const char *buffer,int pos){
-        int PareNum;
-        for(PareNum=1;;pos++){
-            if(buffer[pos]=='\"'){
-                for(pos++;;pos++){
-                    if(buffer[pos]=='\"') break;
-                }
-                continue;
-            }
-            else if(buffer[pos]=='[') PareNum++;
-            else if(buffer[pos]==']'){
-                PareNum--;
-                if(PareNum==0) return pos;
-            }
-            else if(buffer[pos]=='\0') break;
-        }
-        return 0;
+        return buffer[2+index];
     }
 };

trunk/jenga/include/smoothie/Type.h

@@ -139 +139 @@
     static bool StringToBasicType( const std::string &typeName, int &basicType );
     static bool StringToType( const std::string &typeName, Type &type );
+    static int GetBasicTypeFromSimpleName( const char *variable );
 };
 

trunk/jenga/include/smoothie/TypeDef.h

@@ -20 +20 @@
     Type baseType;
 public:
-    TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName );
+    TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine );
     ~TypeDef();
 
@@ -46 +46 @@
     ~TypeDefCollection();
 
-    void Add( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName );
+    void Add( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine );
     int GetIndex( const NamespaceScopes &namespaceScopes, const string &name ) const;
     int GetIndex( const string &fullName ) const;

trunk/jenga/include/smoothie/Variable.h

@@ -176 +176 @@
 
 extern Variables globalVars;
-
-
-

trunk/jenga/projects/smoothie/smoothie.vcproj

@@ -273 +273 @@
             </File>
             <File
+                RelativePath="..\..\src\smoothie\LexicalAnalysis.cpp"
+                >
+            </File>
+            <File
                 RelativePath="..\..\src\smoothie\Method.cpp"
                 >
@@ -281 +285 @@
             </File>
             <File
+                RelativePath="..\..\src\smoothie\Procedure.cpp"
+                >
+            </File>
+            <File
                 RelativePath="..\..\src\smoothie\Prototype.cpp"
                 >
@@ -298 +306 @@
             <File
                 RelativePath="..\..\src\smoothie\Type.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\..\src\smoothie\TypeDef.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\..\src\smoothie\Variable.cpp"
                 >
             </File>
@@ -315 +331 @@
             </File>
             <File
+                RelativePath="..\..\include\smoothie\LexicalAnalysis.h"
+                >
+            </File>
+            <File
                 RelativePath="..\..\include\smoothie\Member.h"
                 >

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
 {