--- a/Make.proto Fri Apr 09 13:11:14 2010 +0000
+++ b/Make.proto Sun Apr 11 10:58:42 2010 +0000
@@ -90,10 +90,13 @@
cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/xml/stx && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -127,7 +130,6 @@
$(OUTDIR)IRAccess.$(O) IRAccess.$(H): IRAccess.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRClosure.$(O) IRClosure.$(H): IRClosure.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRConstant.$(O) IRConstant.$(H): IRConstant.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)IRDecompiler.$(O) IRDecompiler.$(H): IRDecompiler.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInterpreter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRDup.$(O) IRDup.$(H): IRDup.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRJump.$(O) IRJump.$(H): IRJump.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRLine.$(O) IRLine.$(H): IRLine.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec Fri Apr 09 13:11:14 2010 +0000
+++ b/Make.spec Sun Apr 11 10:58:42 2010 +0000
@@ -63,7 +63,6 @@
IRAccess \
IRClosure \
IRConstant \
- IRDecompiler \
IRDup \
IRJump \
IRLine \
@@ -103,7 +102,6 @@
$(OUTDIR)IRAccess.$(O) \
$(OUTDIR)IRClosure.$(O) \
$(OUTDIR)IRConstant.$(O) \
- $(OUTDIR)IRDecompiler.$(O) \
$(OUTDIR)IRDup.$(O) \
$(OUTDIR)IRJump.$(O) \
$(OUTDIR)IRLine.$(O) \
--- a/abbrev.stc Fri Apr 09 13:11:14 2010 +0000
+++ b/abbrev.stc Sun Apr 11 10:58:42 2010 +0000
@@ -1,17 +1,16 @@
IRBuilder IRBuilder cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
-IRBuilderTest IRBuilderTest cvut:stx/goodies/newcompiler 'NewCompiler-IR-Tests' 2
+IRBuilderTest IRBuilderTest cvut:stx/goodies/newcompiler 'NewCompiler-IR-Tests' 4
IRBytecodeGenerator IRBytecodeGenerator cvut:stx/goodies/newcompiler 'NewCompiler-Bytecode' 0
IRFunction IRFunction cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRInstruction IRInstruction cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRInterpreter IRInterpreter cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRSequence IRSequence cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRStackCount IRStackCount cvut:stx/goodies/newcompiler 'NewCompiler-Bytecode' 0
-IRTransformTest IRTransformTest cvut:stx/goodies/newcompiler 'NewCompiler-IR-Tests' 2
+IRTransformTest IRTransformTest cvut:stx/goodies/newcompiler 'NewCompiler-IR-Tests' 4
cvut_stx_goodies_newcompiler cvut_stx_goodies_newcompiler cvut:stx/goodies/newcompiler '* Projects & Packages *' 3
IRAccess IRAccess cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRClosure IRClosure cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRConstant IRConstant cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
-IRDecompiler IRDecompiler cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRDup IRDup cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRJump IRJump cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
IRLine IRLine cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
--- a/bc.mak Fri Apr 09 13:11:14 2010 +0000
+++ b/bc.mak Sun Apr 11 10:58:42 2010 +0000
@@ -48,10 +48,13 @@
pushd ..\..\..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\stx\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\stx\goodies\xml\vw & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\stx\goodies\xml\stx & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libcompat & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -77,7 +80,6 @@
$(OUTDIR)IRAccess.$(O) IRAccess.$(H): IRAccess.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRInstruction.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRClosure.$(O) IRClosure.$(H): IRClosure.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRConstant.$(O) IRConstant.$(H): IRConstant.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRInstruction.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)IRDecompiler.$(O) IRDecompiler.$(H): IRDecompiler.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRInterpreter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRDup.$(O) IRDup.$(H): IRDup.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRInstruction.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRJump.$(O) IRJump.$(H): IRJump.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRInstruction.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRLine.$(O) IRLine.$(H): IRLine.st $(INCLUDE_TOP)\cvut\stx\goodies\newcompiler\IRInstruction.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/cvut_stx_goodies_newcompiler.st Fri Apr 09 13:11:14 2010 +0000
+++ b/cvut_stx_goodies_newcompiler.st Sun Apr 11 10:58:42 2010 +0000
@@ -19,14 +19,14 @@
exclude individual packages in the #excludedFromPrerequisites method."
^ #(
- #'stx:goodies/refactoryBrowser/parser' "RBIdentifierToken - referenced by IRDecompiler>>newVar: "
+ #'stx:goodies/refactoryBrowser/parser'
#'stx:goodies/sunit' "TestCase - superclass of IRTransformTest "
#'stx:libbasic' "Link - superclass of IRLine "
#'stx:libbasic2' "OrderedDictionary - referenced by IRBytecodeGenerator>>initialize "
#'stx:libcomp' "PrimitiveNode - referenced by IRFunction>>initialize "
- #'stx:libcompat' "Preferences - referenced by IRDecompiler>>removeClosureCreation: "
+ #'stx:libcompat'
#'stx:libtool' "Tools::Inspector2Tab - referenced by IRFunction>>inspector2TabIRCode "
- #'stx:libwidg' "ScrollableView - referenced by IRFunction>>inspector2TabIRCode "
+ #'stx:libwidg'
)
! !
--- a/libInit.cc Fri Apr 09 13:11:14 2010 +0000
+++ b/libInit.cc Sun Apr 11 10:58:42 2010 +0000
@@ -13,8 +13,17 @@
#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
DLL_EXPORT void _libcvut_stx_goodies_newcompiler_Init() INIT_TEXT_SECTION;
+// DLL_EXPORT void _libcvut_stx_goodies_newcompiler_InitDefinition() INIT_TEXT_SECTION;
#endif
+// void _libcvut_stx_goodies_newcompiler_InitDefinition(pass, __pRT__, snd)
+// OBJ snd; struct __vmData__ *__pRT__; {
+// __BEGIN_PACKAGE2__("libcvut_stx_goodies_newcompiler__DFN", _libcvut_stx_goodies_newcompiler_InitDefinition, "cvut:stx/goodies/newcompiler");
+// _cvut_137stx_137goodies_137newcompiler_Init(pass,__pRT__,snd);
+
+// __END_PACKAGE__();
+// }
+
void _libcvut_stx_goodies_newcompiler_Init(pass, __pRT__, snd)
OBJ snd; struct __vmData__ *__pRT__; {
__BEGIN_PACKAGE2__("libcvut_stx_goodies_newcompiler", _libcvut_stx_goodies_newcompiler_Init, "cvut:stx/goodies/newcompiler");
@@ -31,7 +40,6 @@
_IRAccess_Init(pass,__pRT__,snd);
_IRClosure_Init(pass,__pRT__,snd);
_IRConstant_Init(pass,__pRT__,snd);
-_IRDecompiler_Init(pass,__pRT__,snd);
_IRDup_Init(pass,__pRT__,snd);
_IRJump_Init(pass,__pRT__,snd);
_IRLine_Init(pass,__pRT__,snd);
--- a/newcompiler.rc Fri Apr 09 13:11:14 2010 +0000
+++ b/newcompiler.rc Sun Apr 11 10:58:42 2010 +0000
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: cvut_stx_goodies_newcompiler.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,4,0,1
- PRODUCTVERSION 5,4,6,1
+ FILEVERSION 5,4,31,31
+ PRODUCTVERSION 5,4,6,2
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
FILEOS VOS_NT_WINDOWS32
@@ -18,12 +18,12 @@
BEGIN
VALUE "CompanyName", "CVUT FEI & Mathieu Suen\0"
VALUE "FileDescription", "Smalltalk/X Bytecode generation library based on Squeak's NewCompiler (LIB)\0"
- VALUE "FileVersion", "5.4.0.1\0"
+ VALUE "FileVersion", "5.4.31.31\0"
VALUE "InternalName", "cvut:stx/goodies/newcompiler\0"
VALUE "LegalCopyright", "Copyright Jan Vrany & Mathieu Suen 2008\0"
VALUE "ProductName", "NewCompiler\0"
- VALUE "ProductVersion", "5.4.6.1\0"
- VALUE "ProductDate", "Mon, 28 Dec 2009 16:19:18 GMT\0"
+ VALUE "ProductVersion", "5.4.6.2\0"
+ VALUE "ProductDate", "Sun, 11 Apr 2010 10:58:24 GMT\0"
END
END