--- a/Make.proto Mon Sep 17 09:03:06 2012 +0000
+++ b/Make.proto Mon Oct 29 10:41:23 2012 +0000
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcompat -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcompat -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool
# if you need any additional defines for embedded C code,
@@ -140,14 +140,12 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)IRBuilder.$(O) IRBuilder.$(H): IRBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)IRBuilderTest.$(O) IRBuilderTest.$(H): IRBuilderTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRBytecodeGenerator.$(O) IRBytecodeGenerator.$(H): IRBytecodeGenerator.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRFunction.$(O) IRFunction.$(H): IRFunction.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRInstruction.$(O) IRInstruction.$(H): IRInstruction.st $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRInterpreter.$(O) IRInterpreter.$(H): IRInterpreter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRSequence.$(O) IRSequence.$(H): IRSequence.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IRStackCount.$(O) IRStackCount.$(H): IRStackCount.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)IRTransformTest.$(O) IRTransformTest.$(H): IRTransformTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)cvut_stx_goodies_newcompiler.$(O) cvut_stx_goodies_newcompiler.$(H): cvut_stx_goodies_newcompiler.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(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)
--- a/Make.spec Mon Sep 17 09:03:06 2012 +0000
+++ b/Make.spec Mon Oct 29 10:41:23 2012 +0000
@@ -51,14 +51,12 @@
COMMON_CLASSES= \
IRBuilder \
- IRBuilderTest \
IRBytecodeGenerator \
IRFunction \
IRInstruction \
IRInterpreter \
IRSequence \
IRStackCount \
- IRTransformTest \
cvut_stx_goodies_newcompiler \
IRAccess \
IRClosure \
@@ -91,14 +89,12 @@
COMMON_OBJS= \
$(OUTDIR)IRBuilder.$(O) \
- $(OUTDIR)IRBuilderTest.$(O) \
$(OUTDIR)IRBytecodeGenerator.$(O) \
$(OUTDIR)IRFunction.$(O) \
$(OUTDIR)IRInstruction.$(O) \
$(OUTDIR)IRInterpreter.$(O) \
$(OUTDIR)IRSequence.$(O) \
$(OUTDIR)IRStackCount.$(O) \
- $(OUTDIR)IRTransformTest.$(O) \
$(OUTDIR)cvut_stx_goodies_newcompiler.$(O) \
$(OUTDIR)IRAccess.$(O) \
$(OUTDIR)IRClosure.$(O) \
--- a/bc.mak Mon Sep 17 09:03:06 2012 +0000
+++ b/bc.mak Mon Oct 29 10:41:23 2012 +0000
@@ -34,7 +34,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcompat -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcompat -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -76,14 +76,12 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)IRBuilder.$(O) IRBuilder.$(H): IRBuilder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)IRBuilderTest.$(O) IRBuilderTest.$(H): IRBuilderTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRBytecodeGenerator.$(O) IRBytecodeGenerator.$(H): IRBytecodeGenerator.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRFunction.$(O) IRFunction.$(H): IRFunction.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRInstruction.$(O) IRInstruction.$(H): IRInstruction.st $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRInterpreter.$(O) IRInterpreter.$(H): IRInterpreter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRSequence.$(O) IRSequence.$(H): IRSequence.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)IRStackCount.$(O) IRStackCount.$(H): IRStackCount.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)IRTransformTest.$(O) IRTransformTest.$(H): IRTransformTest.st $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)cvut_stx_goodies_newcompiler.$(O) cvut_stx_goodies_newcompiler.$(H): cvut_stx_goodies_newcompiler.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(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)
--- a/cvut_stx_goodies_newcompiler.st Mon Sep 17 09:03:06 2012 +0000
+++ b/cvut_stx_goodies_newcompiler.st Mon Oct 29 10:41:23 2012 +0000
@@ -11,33 +11,44 @@
!cvut_stx_goodies_newcompiler class methodsFor:'description'!
preRequisites
+ "list all required packages.
+ This list can be maintained manually or (better) generated and
+ updated by scanning the superclass hierarchies and looking for
+ global variable accesses. (the browser has a menu function for that)
+ Howevery, often too much is found, and you may want to explicitely
+ exclude individual packages in the #excludedFromPrerequisites method."
+
^ #(
- #'stx:goodies/refactoryBrowser/parser' "RBIdentifierToken - referenced by IRDecompiler>>newVar: "
- #'stx:goodies/sunit' "TestCase - superclass of IRTransformTest "
- #'stx:libbasic' "Link - superclass of IRLine "
+ #'stx:goodies/refactoryBrowser/parser' "RBReturnNode - referenced by IRDecompiler>>addReturn:from: "
+ #'stx:goodies/sunit' "TestAsserter - superclass of IRTransformTest "
+ #'stx:libbasic' "Link - superclass of IRSend "
#'stx:libbasic2' "OrderedDictionary - referenced by IRBytecodeGenerator>>initialize "
- #'stx:libcomp' "PrimitiveNode - referenced by IRFunction>>initialize "
+ #'stx:libcomp' "Parser - superclass of extended ByteCodeCompiler "
#'stx:libcompat' "Preferences - referenced by IRDecompiler>>removeClosureCreation: "
- #'stx:libwidg' "ScrollableView - referenced by IRFunction>>inspector2TabIRCode "
+ #'stx:libtool' "Tools::Inspector2Tab - referenced by IRFunction>>inspector2TabIRCode "
+ #'stx:libwidg' "TextView - referenced by IRFunction>>inspector2TabIRCode "
)
-
- "Modified: / 17-09-2012 / 09:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!cvut_stx_goodies_newcompiler class methodsFor:'description - contents'!
classNamesAndAttributes
+ "lists the classes which are to be included in the project.
+ Each entry in the list may be: a single class-name (symbol),
+ or an array-literal consisting of class name and attributes.
+ Attributes are: #autoload or #<os> where os is one of win32, unix,..."
+
^ #(
"<className> or (<className> attributes...) in load order"
IRBuilder
- IRBuilderTest
+ (IRBuilderTest autoload)
IRBytecodeGenerator
IRFunction
IRInstruction
IRInterpreter
IRSequence
IRStackCount
- IRTransformTest
+ (IRTransformTest autoload)
#'cvut_stx_goodies_newcompiler'
IRAccess
IRClosure
@@ -68,6 +79,9 @@
!
extensionMethodNames
+ "lists the extension methods which are to be included in the project.
+ Entries are 2-element array literals, consisting of class-name and selector."
+
^ #(
ByteCodeCompiler literalArray:
Class binding
@@ -124,9 +138,9 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"nil"$"
+ ^ "$SVN-Revision:"'nil'"$"
- "Modified: / 17-09-2012 / 10:02:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 29-10-2012 / 10:42:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!cvut_stx_goodies_newcompiler class methodsFor:'documentation'!
--- a/lccmake.bat Mon Sep 17 09:03:06 2012 +0000
+++ b/lccmake.bat Mon Oct 29 10:41:23 2012 +0000
@@ -3,6 +3,6 @@
@REM type lccmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USELCC=1 %*
+make.exe -N -f bc.mak -DUSELCC=1 %*
--- a/libInit.cc Mon Sep 17 09:03:06 2012 +0000
+++ b/libInit.cc Mon Oct 29 10:41:23 2012 +0000
@@ -28,14 +28,12 @@
OBJ snd; struct __vmData__ *__pRT__; {
__BEGIN_PACKAGE2__("libcvut_stx_goodies_newcompiler", _libcvut_stx_goodies_newcompiler_Init, "cvut:stx/goodies/newcompiler");
_IRBuilder_Init(pass,__pRT__,snd);
-_IRBuilderTest_Init(pass,__pRT__,snd);
_IRBytecodeGenerator_Init(pass,__pRT__,snd);
_IRFunction_Init(pass,__pRT__,snd);
_IRInstruction_Init(pass,__pRT__,snd);
_IRInterpreter_Init(pass,__pRT__,snd);
_IRSequence_Init(pass,__pRT__,snd);
_IRStackCount_Init(pass,__pRT__,snd);
-_IRTransformTest_Init(pass,__pRT__,snd);
_cvut_137stx_137goodies_137newcompiler_Init(pass,__pRT__,snd);
_IRAccess_Init(pass,__pRT__,snd);
_IRClosure_Init(pass,__pRT__,snd);
--- a/mingwmake.bat Mon Sep 17 09:03:06 2012 +0000
+++ b/mingwmake.bat Mon Oct 29 10:41:23 2012 +0000
@@ -3,6 +3,6 @@
@REM type mingwmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USEMINGW=1 %*
+make.exe -N -f bc.mak -DUSEMINGW=1 %*
--- a/newcompiler.rc Mon Sep 17 09:03:06 2012 +0000
+++ b/newcompiler.rc Mon Oct 29 10:41:23 2012 +0000
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Jan Vrany & Mathieu Suen 2008\0"
VALUE "ProductName", "NewCompiler\0"
VALUE "ProductVersion", "6.2.3.1\0"
- VALUE "ProductDate", "Mon, 17 Sep 2012 09:03:27 GMT\0"
+ VALUE "ProductDate", "Mon, 29 Oct 2012 10:43:04 GMT\0"
END
END