Changeset 14 in dev for BasicCompiler_Common

Timestamp:

Dec 10, 2006, 10:58:26 AM (17 years ago)

Author:

dai_9181

Message:

LexicalAnalysisのベース部分を用意。

Location:

BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (1 diff)
• BasicCompiler.h (modified) (1 diff)
• DebugMiddleFile.cpp (modified) (3 diffs)
• DebugSection.h (modified) (1 diff)
• LexicalAnalysis.cpp (added)
• LexicalAnalysis.h (added)
• MakeExe.cpp (modified) (4 diffs)
• calculation.cpp (modified) (1 diff)
• common.h (modified) (6 diffs)
• preprocessor.cpp (modified) (4 diffs)

BasicCompiler_Common/BasicCompiler.cpp

@@ -1 @@
-#ifdef _AMD64_
-#include "../BasicCompiler64/BasicCompiler.h"
-#else
-#include "../BasicCompiler32/BasicCompiler.h"
-#endif
+#include "BasicCompiler.h"
+
 
 #if defined HeapAlloc

BasicCompiler_Common/BasicCompiler.h

@@ -1 @@
-#include "../BasicCompiler_Common/common.h"
+#include "common.h"
 
 LPSTR BasicFileFilter="プログラム ファイル(*.ab;*.bas;*.abp;*.sbp)\0*.ab;*.bas;*.abp;*sbp\0テキスト ファイル(*.txt)\0*.txt\0すべてのファイル(*.*)\0*\0\0";

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -474 +474 @@
     //ソースコード
     i2++;
-    pBaseBuffer=(char *)HeapAlloc(hHeap,0,lstrlen(buffer+i2)+3);
-    basbuf=pBaseBuffer+2;
-    lstrcpy(basbuf,buffer+i2);
-    i2+=lstrlen(buffer+i2)+1;
+    CSource::obj.SetSourceCode(buffer + i2);
+    this->basbuf=CSource::obj.SourceCode;
     extern char *basbuf;
     basbuf=this->basbuf;
+    i2+=lstrlen(buffer+i2)+1;
 
     //コードと行番号の関係
@@ -934 +933 @@
 
     //ソースコード
-    extern char *pBaseBuffer;
     extern char *basbuf;
-    pBaseBuffer=this->pBaseBuffer;
     basbuf=this->basbuf;
 
@@ -1016 +1013 @@
     DeleteConstInfo(ppConstHash);
 
-    //ソースコードを解放
-    HeapDefaultFree(pBaseBuffer);
-
     //コードと行番号の関係を解放
     HeapDefaultFree(pLineInfo);

BasicCompiler_Common/DebugSection.h

@@ -25 +25 @@
 
     //ソースコード
-    char *pBaseBuffer;
     char *basbuf;
 

BasicCompiler_Common/MakeExe.cpp

@@ -34 +34 @@
 }
 
-void AddSourceCode(char *buffer){
-    char *temp;
-    temp=(char *)HeapAlloc(hHeap,0,lstrlen(buffer)+8192);
-    lstrcpy(temp,buffer);
-
-    //エスケープシーケンス設定
-    SetEscapeSequenceFormat(temp);
-
-    //コマンド対応
-    ChangeCommandToCode(temp);
-
-    //新しいソースコードバッファの容量
-    extern char *basbuf;
-    int NewSize;
-    NewSize=lstrlen(basbuf)+lstrlen(temp);
-    NewSize*=2;
-    NewSize+=255;
-
-    //最後尾に貼り付け
-    extern char *pBaseBuffer;
-    pBaseBuffer=(char *)HeapReAlloc(hHeap,0,pBaseBuffer,NewSize);
-    basbuf=pBaseBuffer+2;
-    lstrcat(basbuf,temp);
-
-    HeapDefaultFree(temp);
-}
-
 void OutputExe(void){
     extern HANDLE hHeap;
     extern char *basbuf;
-    extern char *pBaseBuffer;
     extern int ErrorNum;
     extern BOOL bStopCompile;
@@ -87 +59 @@
     //プログラムをファイルから読み込む
     extern char SourceFileName[MAX_PATH];
-    pBaseBuffer=OpenBasicFile(SourceFileName);
-    if(!pBaseBuffer){
-        SetError(201,SourceFileName,-1);
-        goto EndCompile;
-    }
-    basbuf=pBaseBuffer+2;
+    CSource::obj.OpenFile(SourceFileName);
+
+    //未完成
+    basbuf = CSource::obj.SourceCode;
 
     //イメージベースの設定
@@ -172 +142 @@
 
     StepCompileProgress();
+
+
+    //字句解析
+    CSource::obj.LexicalAnalysis(0);
 
 
@@ -291 +265 @@
         HeapDefaultFree(IncludeFileInfo.ppFileNames[i2]);
     HeapDefaultFree(IncludeFileInfo.ppFileNames);
-
-    if(pBaseBuffer) HeapDefaultFree(pBaseBuffer);
 }
 int MainThread(DWORD dummy){

BasicCompiler_Common/calculation.cpp

@@ -10 +10 @@
 _int64 i64stack[255];
 
+bool IsNumberTopChar(char *buffer){
+    int c = buffer[0];
+    if('0' <= c && c <= '9') return true;
+    if(buffer[0] == '&' && (buffer[1] == 'h' || buffer[1] == 'H' || buffer[1] == 'o' || buffer[1] == 'O')) return true;
+
+    return false;
+}
+bool IsNumberChar(char c){
+    if('0' <= c && c <= '9') return true;
+    if('a' <= c && c <= 'f') return true;
+    if('A' <= c && c <= 'F') return true;
+
+    return false;
+}
 BOOL IsJudgMark(char *Command,int p){
     if(Command[p]==1){

BasicCompiler_Common/common.h

@@ -1 @@
-#define _CRT_SECURE_NO_DEPRECATE
+//#define _CRT_SECURE_NO_DEPRECATE
+#pragma warning(disable : 4996)
 
 #include <windows.h>
@@ -28 +29 @@
 #include "../BasicCompiler_Common/psapi.h"
 #include "../BasicCompiler_Common/BreakPoint.h"
+#include "../BasicCompiler_Common/LexicalAnalysis.h"
 
 
@@ -150 +152 @@
     int FilesNum;
     int LineOfFile[MAX_LEN];
+};
+
+//#define情報
+class CDefine{
+    int num;
+    char **ppNames;
+public:
+    CDefine();
+    ~CDefine();
+
+    BOOL add(char *name);
+    BOOL undef(char *name);
+    BOOL check(char *name);
 };
 
@@ -451 +466 @@
 void DeleteConstInfo(CONSTINFO **ppConstHash);
 void DeleteDeclareInfo(void);
-void AddSourceCode(char *buffer);
 void OutputExe(void);
 int MainThread(DWORD dummy);
@@ -473 +487 @@
 
 //preprocessor.cpp
-char *OpenBasicFile(char *FileName);
+void DirectiveIfdef(char *buffer);
+char *IncludeFiles(char *base);
 
 //Resource.cpp
@@ -516 +531 @@
 
 //calculation.cpp
+bool IsNumberTopChar(char *buffer);
+bool IsNumberChar(char c);
 BOOL IsNumCalcMark(char *Command,int p);
 BOOL IsNumCalcMark_Back(char *Command,int p);

BasicCompiler_Common/preprocessor.cpp

@@ -8 +8 @@
 
 
-class CDefine{
-    int num;
-    char **ppNames;
-public:
-    CDefine();
-    ~CDefine();
-
-    BOOL add(char *name);
-    BOOL undef(char *name);
-    BOOL check(char *name);
-};
 CDefine::CDefine(){
     extern HANDLE hHeap;
@@ -311 +300 @@
 
 char *IncludeFiles(char *base){
-    extern HANDLE hHeap;
     extern char szIncludeDir[MAX_PATH];
     extern char BasicCurDir[MAX_PATH];
@@ -435 +423 @@
 
             i3=lstrlen(buffer)+FileSize;
-            base=(char *)HeapReAlloc(hHeap,HEAP_ZERO_MEMORY,base,i3*2);
+            base=(char *)realloc(base,i3*2);
             buffer=base+2;
             SlideString(buffer+i2,FileSize+(i-i2));
@@ -463 +451 @@
     return base;
 }
-char *OpenBasicFile(char *FileName){
-    extern HANDLE hHeap;
-    char *base,*buffer;
-    DWORD dwFileSize,dwAccBytes;
-    HANDLE hFile;
-
-    //ファイルオープン
-    hFile=CreateFile(FileName,GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-    if(hFile==INVALID_HANDLE_VALUE) return 0;
-
-    //#define情報を初期化
-    pobj_define=new CDefine;
-
-    //バッファ領域確保
-    dwFileSize=GetFileSize(hFile,0);
-    base=(char *)HeapAlloc(hHeap,0,dwFileSize*2+255);
-    base[0]='\n';
-    base[1]='\n';
-    buffer=base+2;
-    lstrcpy(buffer,"#include <basic.sbp>\n");
-    buffer+=lstrlen(buffer);
-
-    //読み込み
-    ReadFile(hFile,buffer,dwFileSize,&dwAccBytes,0);
-    buffer[dwAccBytes]=0;
-
-    //CRLFをLFに変換
-    ChangeReturnCode(buffer);
-
-    //コメント削除
-    DeleteComment(buffer);
-
-    //#ifdefディレクティブ
-    DirectiveIfdef(buffer);
-
-    //最終行には文字を含ませないようにする
-    lstrcat(buffer,"\n");
-
-    //ファイルクローズ
-    CloseHandle(hFile);
-
-    //インクルードファイルを読み込む
-    base=IncludeFiles(base);
-
-    //#define情報を破棄
-    delete pobj_define;
-    pobj_define=0;
-
-    return base;
-}