Changeset 56 in dev for BasicCompiler_Common

Timestamp:

Feb 15, 2007, 3:39:40 AM (18 years ago)

Author:

dai_9181

Message:

・[Unicode]リテラル文字列のスイッチング
・[Unicode]Char型を文字型として扱うようにする
・[Unicode]SByte型を追加する
に対応。

/unicodeコマンドオプションに対応。

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (4 diffs)
• Class.h (modified) (1 diff)
• Compile.cpp (modified) (1 diff)
• common.h (modified) (1 diff)

BasicCompiler_Common/Class.cpp

@@ -13 +13 @@
 
 CMember *pCompilingMethod;
-
-int AddDataTable(char *buffer,int length);
 
 
@@ -412 +410 @@
 
 
-LONG_PTR CClass::AddVtblDataTable(SUBINFO **ppsi,int length){
-    return AddDataTable((char *)ppsi,length);
-}
 int CClass::GetFuncNumInVtbl( const SUBINFO *psi ) const
 {
@@ -454 +449 @@
     }
 
-    vtbl_offset=AddDataTable((char *)ppsi,vtbl_num*sizeof(LONG_PTR));
+    vtbl_offset=dataTable.AddBinary((void *)ppsi,vtbl_num*sizeof(LONG_PTR));
 
     for( int i=0; i < vtbl_num; i++ ){
@@ -467 +462 @@
     if(vtbl_offset==-1) return;
 
-    extern char *DataTable;
     LONG_PTR *pVtbl;
-    pVtbl=(LONG_PTR *)(DataTable+vtbl_offset);
+    pVtbl=(LONG_PTR *)((char *)dataTable.GetPtr()+vtbl_offset);
 
     int i;

BasicCompiler_Common/Class.h

@@ -140 +140 @@
 private:
     long vtbl_offset;
-    LONG_PTR AddVtblDataTable(SUBINFO **ppsi,int length);
 public:
     int GetFuncNumInVtbl( const SUBINFO *psi ) const;

BasicCompiler_Common/Compile.cpp

@@ -30 +30 @@
 GOTOLABELSCHEDULE *pGotoLabelSchedule;
 int GotoLabelScheduleNum;
-
-//データ テーブル
-char *DataTable;
-int DataTableSize;
 
 //グローバル変数初期バッファ

BasicCompiler_Common/common.h

@@ -592 +592 @@
 extern CLoopRefCheck *pobj_LoopRefCheck;
 
+//DataTable.cpp
+class DataTable{
+    void *pdata;
+    int size;
+
+public:
+    DataTable();
+    ~DataTable();
+    void Init();
+
+    int AddBinary( const void *pdata, int size );
+    int Add( _int64 i64data );
+    int Add( int i32data );
+    int Add( double dbl );
+    int Add( float flt );
+    int AddString( const char *str, int length );
+    int AddString( const char *str );
+
+    const void *GetPtr() const;
+    int GetSize() const;
+};
+extern DataTable dataTable;
+
 //error.cpp
 void SetError(int ErrorNum,const char *KeyWord,int pos);