Changeset 205 in dev for trunk/jenga/include/smoothie

Timestamp:

Jul 12, 2007, 2:57:04 AM (17 years ago)

Author:

dai_9181

Message:

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

Location:

trunk/jenga/include/smoothie

Files:

• BasicFixed.h (modified) (2 diffs)
• Class.h (deleted)
• LexicalAnalysis.h (modified) (2 diffs)
• LexicalScoping.h (modified) (1 diff)
• Member.h (deleted)
• Method.h (deleted)
• ObjectModule.h (deleted)
• Parameter.h (deleted)
• Procedure.h (deleted)
• Prototype.h (deleted)
• Smoothie.h (modified) (2 diffs)
• Source.h (modified) (2 diffs)
• Symbol.h (deleted)
• Type.h (deleted)
• Variable.h (deleted)

trunk/jenga/include/smoothie/BasicFixed.h

@@ -186 +186 @@
 #define ESC_IMPORTS         'q'     // Imports
 #define ESC_CLEARNAMESPACEIMPORTED 'r'  // _ClearNamespaceImported
+#define ESC_OPERATOR        's'
 //EXEファイル用制御エスケープシーケンス
-#define ESC_USING           's'     // Print命令語のUsing
-#define ESC_FOR             't'     // Open命令語のFor
-#define ESC_LINENUM         'u'     // 行番号を示す
+#define ESC_USING           't'     // Print命令語のUsing
+#define ESC_FOR             'u'     // Open命令語のFor
+#define ESC_LINENUM         'v'     // 行番号を示す
 
 //オブジェクト指向エスケープシーケンス
@@ -203 +204 @@
 #define ESC_INTERFACE       (char)0xA9
 #define ESC_ENDINTERFACE    (char)0xAA
-#define ESC_OPERATOR        (char)0xAB

trunk/jenga/include/smoothie/LexicalAnalysis.h

@@ -1 +1 @@
 #pragma once
+
+#include <string>
+#include <vector>
+
+#include <windows.h>
+
+typedef std::vector<int> Subscripts;
+
+enum ReferenceKind
+{
+    RefNon = 0,     // no reference member
+    RefDot,         // obj.member
+    RefPointer,     // obj->member
+};
 
 bool IsVariableTopChar(char c);
@@ -13 +27 @@
 bool IsCommandDelimitation( char c );
 int GetStringInPare_RemovePare(char *buffer,const char *ReadBuffer);
-void GetArrange(char *variable,char *variAnswer,int *SubScripts);
+void GetArrange(char *variable,char *variAnswer, Subscripts &subscripts );
+bool SplitMemberName( const char *desc, char *object, char *member, ReferenceKind &refType );
+bool SplitMemberName( const char *desc, char *object, char *member );
+void GetCalcName(int idCalc,char *name);
+BYTE ToCalcId( const char *name );
+std::string Operator_NaturalStringToCalcMarkString( const std::string &name );
+std::string Operator_CalcMarkStringToNaturalString( const std::string &name );

trunk/jenga/include/smoothie/LexicalScoping.h

@@ -56 +56 @@
 
     // スコープを終了
-    void End();
+    virtual void End() = 0;
 
     // スコープを検索

trunk/jenga/include/smoothie/Smoothie.h

@@ -2 +2 @@
 
 #include "Source.h"
-#include "ObjectModule.h"
 #include "LexicalScoping.h"
 
@@ -27 +26 @@
     class Temp{
     public:
-        // コンパイル中のクラス
-        static const CClass *pCompilingClass;
-
         // レキシカルスコープの状態
         static CLexicalScopes *pLexicalScopes;

trunk/jenga/include/smoothie/Source.h

@@ -7 +7 @@
 #include <stdlib.h>
 
-#include "BasicFixed.h"
+#include <jenga/include/common/Exception.h>
+#include <jenga/include/smoothie/BasicFixed.h>
 
 using namespace std;
@@ -100 +101 @@
         if( index>GetLength() )
         {
-            throw "bad access";
+            Jenga::Throw( "BasicSource bad access" );
         }
         return buffer[2+index];