Changeset 206 in dev for trunk/abdev/BasicCompiler_Common/common.h

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

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

File:

• trunk/abdev/BasicCompiler_Common/common.h (modified) (11 diffs)

trunk/abdev/BasicCompiler_Common/common.h

@@ +1 @@
+#pragma once
+
 //#define _CRT_SECURE_NO_DEPRECATE
 #pragma warning(disable : 4996)
 
 #include <option.h>
-
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <commctrl.h>
-#include <time.h>
-#include <limits.h>
-#include <shlobj.h>
-#include <vector>
-#include <string>
-#include <fstream>
-
-//boost libraries
-#include <boost/foreach.hpp>
 
 using namespace std;
@@ -33 +20 @@
 #endif
 
-#include "../BasicCompiler_Common/BasicFixed.h"
+#include <jenga/include/smoothie/BasicFixed.h>
 #include "../BasicCompiler_Common/NonVolatile.h"
 #include "../BasicCompiler_Common/psapi.h"
@@ -139 +126 @@
 
 
-// 列挙体管理用のクラス
-#include "Enum.h"
-
-// 定数管理用のクラス
-#include "Const.h"
-
-
 
 struct ERRORINFO{
@@ -157 +137 @@
     LONG_PTR offset;
     BOOL bOffsetOffset;
-};
-
-struct CONSTINFO{
-    char *name;
-    char *StrValue;
-
-    double DblValue;
-    _int64 i64Value;
-    int type;
-    LONG_PTR lpIndex;
-
-    int ParmNum;
-    char **ppParm;
-
-    CONSTINFO *pNextData;
 };
 
@@ -245 +210 @@
 
 #include "../BasicCompiler_Common/PESchedule.h"
-#include "../BasicCompiler_Common/DebugSection.h"
 #include "../BasicCompiler_Common/VariableOpe.h"
 
@@ -268 +232 @@
 //hash.cpp
 int hash_default(const char *name);
-CONSTINFO *GetConstHash(const char *name);
 DllProc *GetDeclareHash(char *name);
-void GetOverloadSubHash( const char *lpszName, std::vector<UserProc *> &subs );
-UserProc *GetSubHash(const char *name,BOOL bError=0);
-UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError=0);
-UserProc *GetClassMethod( const char *className, const char *methodName );
+void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );
+const UserProc *GetSubHash(const char *name,BOOL bError=0);
+const UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError=0);
+const UserProc *GetClassMethod( const char *className, const char *methodName );
 
 //Object.cpp
-void CallConstructor( const char *ObjectName,const int *SubScripts, const Type &type,const char *Parameter);
+void CallConstructor( const char *ObjectName,const Subscripts &subscripts, const Type &type,const char *Parameter);
 bool Operator_New( const char *expression, const Type &baseType, Type &resultType );
 
 //Overload.sbp
-UserProc *OverloadSolutionWithStrParam(
+class Parameters;
+const UserProc *OverloadSolutionWithStrParam(
     const char *name,
-    std::vector<UserProc *> &subs,
+    std::vector<const UserProc *> &subs,
     const char *Parameter,
     const char *ObjectName);
-UserProc *OverloadSolution(
+const UserProc *OverloadSolution(
     const char *name,
-    std::vector<UserProc *> &subs,
+    std::vector<const UserProc *> &subs,
     const Parameters &params,
     const Type &returnType );
@@ -298 +262 @@
 void Debugger_Pause(void);
 ULONG_PTR rva_to_real(DWORD p);
-GlobalProc *GetSubFromObp(ULONG_PTR pos);
+UserProc *GetSubFromObp(ULONG_PTR pos);
 void ReadOpBuffer();
 void DebugProgram(void);
@@ -310 +274 @@
 ULONG_PTR Debugging_GetVarPtr(RELATIVE_VAR *pRelativeVar);
 ULONG_PTR Debugging_GetThisPtrOffset(LONG_PTR obp_Rip);
-int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, int *pss);
+int Debugging_GetVarOffset( char *variable,RELATIVE_VAR *pRelativeVar, Type &resultType, Subscripts *pResultSubscripts = NULL );
 
 //MakeExe.cpp
 void StepCompileProgress(void);
-void DeleteConstInfo(CONSTINFO **ppConstHash);
 void DeleteDeclareInfo(void);
 void AddSourceCode(char *buffer);
@@ -366 +329 @@
 char GetEndXXXCommand(char es);
 void GetDefaultNameFromES(char es,char *name);
-void GetCalcName(int idCalc,char *name);
+const std::string &FormatEscapeSequenceStringToDefaultString( const std::string &source );
 BOOL IsFile(char *path);
 BOOL ShortPathToLongPath(char ShortPath[MAX_PATH],char *LongPath);
@@ -382 +345 @@
 int NeutralizationType(int type1,LONG_PTR index1,int type2,LONG_PTR index2);
 DWORD GetLiteralValue(char *value,_int64 *pi64,int BaseType);
-BOOL GetConstCalcBuffer(const char *name,const char *Parameter,char *pCalcBuffer);
-DWORD GetConstValue(char *name,double *dbl,char *buffer,LONG_PTR *plpIndex);
 int IsStrCalculation(char *Command);
 BYTE GetCalcId(const char *Command,int *pi);
@@ -403 +364 @@
 bool GetReturnTypeOfPropertyMethod( const char *variable, const char *rightSide, Type &resultType );
 bool GetReturnTypeOfIndexerGetterProc( const CClass &objClass, Type &resultType );
-GlobalProc *AddSubData( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic = false );
-void GetSubInfo(void);
-void DeleteSubInfo(GlobalProc **ppSubHash,char **ppMacroNames,int MacroNum);
 void DeleteDeclareInfo(void);
 int AddProcPtrInfo( const string &typeExpression, int nowLine );