Changeset 300 in dev for trunk

Timestamp:

Aug 23, 2007, 10:57:00 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/jenga

Files:

• include/smoothie/LexicalAnalysis.h (modified) (2 diffs)
• src/smoothie/LexicalAnalysis.cpp (modified) (3 diffs)

trunk/jenga/include/smoothie/LexicalAnalysis.h

@@ -23 +23 @@
 int GetStringInPare(char *buffer,const char *ReadBuffer);
 int GetStringInBracket(char *buffer,const char *ReadBuffer);
+int GetStringInGenericBracket(char *buffer,const char *ReadBuffer);
 int JumpStringInPare(const char *buffer,int pos);
 int JumpStringInBracket(const char *buffer,int pos);
@@ -34 +35 @@
 std::string Operator_NaturalStringToCalcMarkString( const std::string &name );
 std::string Operator_CalcMarkStringToNaturalString( const std::string &name );
+bool IsGenericTypeSourcePart( const char *buffer );

trunk/jenga/src/smoothie/LexicalAnalysis.cpp

@@ +1 @@
+#include <jenga/include/common/Exception.h>
 #include <jenga/include/smoothie/SmoothieException.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -137 +138 @@
         else if(ReadBuffer[i]=='['&&IsStr==0) PareNum++;
         else if(ReadBuffer[i]==']'&&IsStr==0){
+            PareNum--;
+            if(PareNum==0){
+                i++;
+                buffer[i]=0;
+                break;
+            }
+        }
+        else if(ReadBuffer[i]=='\0') return 0;
+    }
+    return i;
+}
+int GetStringInGenericBracket(char *buffer,const char *ReadBuffer){
+    int i,IsStr,PareNum;
+    for(i=0,IsStr=0,PareNum=0;;i++){
+        buffer[i]=ReadBuffer[i];
+        if(IsDBCSLeadByte(ReadBuffer[i])){
+            i++;
+            buffer[i]=ReadBuffer[i];
+            continue;
+        }
+        if(ReadBuffer[i]=='\"') IsStr^=1;
+        else if(ReadBuffer[i]=='<'&&IsStr==0) PareNum++;
+        else if(ReadBuffer[i]=='>'&&IsStr==0){
             PareNum--;
             if(PareNum==0){
@@ -349 +373 @@
     return name;
 }
+
+bool IsGenericTypeSourcePart( const char *buffer )
+{
+    if( buffer[0] != '<' )
+    {
+        Jenga::Throw( "意図しない文字列に対してIsGenericTypeSourcePart関数が呼ばれた" );
+        return false;
+    }
+
+    int i=1, scopeCount=1;
+    for( ; ; i++ )
+    {
+        if( buffer[i] == '\0' )
+        {
+            break;
+        }
+        if( buffer[i] == '<' )
+        {
+            scopeCount++;
+        }
+        else if( buffer[i] == '>' )
+        {
+            scopeCount--;
+
+            if( scopeCount == 0 )
+            {
+                break;
+            }
+        }
+    }
+
+    if( buffer[i] != '>' )
+    {
+        return false;
+    }
+
+
+    /////////////////////////////////////////////////////////////////
+    // '>'に続く文字を判定する
+    /////////////////////////////////////////////////////////////////
+
+    i++;
+    while( IsBlank( buffer[i] ) )
+    {
+        i++;
+    }
+
+    if( IsVariableChar( buffer[i] ) )
+    {
+        return false;
+    }
+
+    return true;
+}