--- a/IRTransformTest.st Wed Apr 06 21:17:27 2011 +0000
+++ b/IRTransformTest.st Sat May 07 13:19:45 2011 +0000
@@ -60,12 +60,13 @@
(iRMethod allSequences last) last delete.
(iRMethod allSequences last)
- addInstructions: {(IRInstruction pushLiteral: 2). (IRInstruction returnTop)}.
+ addInstructions: (Array with:(IRInstruction pushLiteral: 2) with: (IRInstruction returnTop)).
aCompiledMethod := iRMethod compiledCode.
self should: [(aCompiledMethod valueWithReceiver: nil arguments: #() ) = 2].
"Modified: / 30-03-2009 / 19:40:10 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 07-05-2011 / 14:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
testAddIntructionsBefore
@@ -82,12 +83,13 @@
push := (iRMethod allSequences last) at: (iRMethod allSequences size - 1) .
(iRMethod allSequences last)
- addInstructions: {(IRInstruction pushLiteral: 2). (IRInstruction returnTop)} before: push.
+ addInstructions: (Array with:(IRInstruction pushLiteral: 2) with: (IRInstruction returnTop)) before: push.
aCompiledMethod := iRMethod compiledCode.
self should: [(aCompiledMethod valueWithReceiver: nil arguments: #() ) = 2].
"Modified: / 30-03-2009 / 19:40:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 07-05-2011 / 14:18:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
testAddIntructionsBeforeFromLList
--- a/Make.proto Wed Apr 06 21:17:27 2011 +0000
+++ b/Make.proto Sat May 07 13:19:45 2011 +0000
@@ -68,8 +68,11 @@
update-svn-revision:
- sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
- cvut_stx_goodies_newcompiler.st
+ if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
+ svnversion -n > .svnversion; \
+ sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+ cvut_stx_goodies_newcompiler.st; \
+ fi
.PHONY: update-svn-revision
@@ -90,19 +93,19 @@
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)/libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/goodies/xml/vw && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/sunit && $(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)"
cd $(TOP)/libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -118,14 +121,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 Wed Apr 06 21:17:27 2011 +0000
+++ b/Make.spec Sat May 07 13:19:45 2011 +0000
@@ -51,14 +51,12 @@
COMMON_CLASSES= \
IRBuilder \
- IRBuilderTest \
IRBytecodeGenerator \
IRFunction \
IRInstruction \
IRInterpreter \
IRSequence \
IRStackCount \
- IRTransformTest \
cvut_stx_goodies_newcompiler \
IRAccess \
IRClosure \
@@ -90,14 +88,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/abbrev.stc Wed Apr 06 21:17:27 2011 +0000
+++ b/abbrev.stc Sat May 07 13:19:45 2011 +0000
@@ -7,7 +7,7 @@
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' 4
-cvut_stx_goodies_newcompiler cvut_stx_goodies_newcompiler cvut:stx/goodies/newcompiler '* Projects & Packages *' 3
+cvut_stx_goodies_newcompiler cvut_stx_goodies_newcompiler cvut:stx/goodies/newcompiler '* Projects & Packages *' 4
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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/autopackage/default.apspec Sat May 07 13:19:45 2011 +0000
@@ -0,0 +1,85 @@
+# -*- shell-script -*-
+[Meta]
+ShortName:
+SoftwareVersion: 6.1.2.1
+DisplayName: Smalltalk/X Bytecode generation library based on Squeak's NewCompiler
+RootName: @exept.de/expecco:$SOFTWAREVERSION
+Summary: Smalltalk/X Bytecode generation library based on Squeak's NewCompiler
+Maintainer: CVUT FEI & Mathieu Suen
+Packager: CVUT FEI & Mathieu Suen
+PackageVersion: 1
+CPUArchitectures: x86
+AutopackageTarget: 1.0
+Type: Library
+License: Commercial
+
+[Description]
+Smalltalk/X Bytecode generation library based on Squeak's NewCompiler
+
+[BuildPrepare]
+# If you're using autotools, the default should be enough.
+# prepareBuild will set up apbuild and run configure for you. If you
+# need to pass arguments to configure, just add them to prepareBuild:
+# prepareBuild --enable-foo --disable-bar
+#prepareBuild
+
+[BuildUnprepare]
+# If you're using prepareBuild above, there is no need to change this!
+#unprepareBuild
+
+[Globals]
+# Variables declared in this section will be available in all other sections
+export APKG_BUILD_SKIP_CONFIGURE=1
+export APKG_BUILD_SKIP_MAKE=1
+export MYPREFIX=/opt/
+
+[Prepare]
+#recommend '@autopackage.org/autopackage-gtk' 1
+
+[Imports]
+import <<EOF
+$source_dir/
+$source_dir/resources
+$source_dir/keyboard.rc
+$source_dir/display.rc
+$source_dir/../doc
+$source_dir/../testsuites/webedition
+$source_dir/../projects/libraries
+$source_dir/../reportGenerator/tools
+$source_dir/../../pdf/afm
+$source_dir/../plugin/selenium/libexept_expecco_plugin_selenium.so
+$source_dir/../externalTools
+EOF
+
+for i in $source_dir/*.so
+do
+ echo $source_dir/$(readlink $i)
+done | import
+
+[Install]
+if [ "$PREFIX" != "/usr" ]
+then
+ export MYPREFIX=$PREFIX
+fi
+
+find . -type d \( -name CVS -or -name 'not_*' \) -print | xargs rm -rf
+mkdir -p $MYPREFIX
+copyFiles expecco *.rc resources $MYPREFIX/bin
+copyFiles *.so $MYPREFIX/lib
+copyFiles doc externalTools $MYPREFIX/packages/exept/expecco
+copyFiles webedition/projects libraries $MYPREFIX/testsuites
+copyFiles tools $MYPREFIX/packages/exept/expecco/reportGenerator
+copyFiles afm $MYPREFIX/packages/exept/pdf
+copyFiles libexept_expecco_plugin_selenium.so $MYPREFIX/plugin
+
+#installExe expecco
+#installLib *.so
+#installData resources
+#installData keyboard.rc
+#installData doc
+
+[Uninstall]
+# Leaving this at the default is safe unless you use custom commands in
+# "Install" to create files. All autopackage API functions
+# that installs files are logged.
+uninstallFromLog
--- a/bc.mak Wed Apr 06 21:17:27 2011 +0000
+++ b/bc.mak Sat May 07 13:19:45 2011 +0000
@@ -48,19 +48,19 @@
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\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\goodies\xml\vw & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\stx\goodies\sunit & $(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) "
pushd ..\..\..\..\stx\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\stx\libcompat & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\..\stx\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -68,14 +68,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 Wed Apr 06 21:17:27 2011 +0000
+++ b/cvut_stx_goodies_newcompiler.st Sat May 07 13:19:45 2011 +0000
@@ -41,14 +41,14 @@
^ #(
"<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
@@ -128,7 +128,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'30'"$"
+ ^ "$SVN-Revision:"'34M'"$"
! !
!cvut_stx_goodies_newcompiler class methodsFor:'documentation'!
--- a/libInit.cc Wed Apr 06 21:17:27 2011 +0000
+++ b/libInit.cc Sat May 07 13:19:45 2011 +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/newcompiler.rc Wed Apr 06 21:17:27 2011 +0000
+++ b/newcompiler.rc Sat May 07 13:19:45 2011 +0000
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: cvut_stx_goodies_newcompiler.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,4,31,31
- PRODUCTVERSION 5,4,6,2
+ FILEVERSION 6,1,33,33
+ PRODUCTVERSION 6,1,2,1
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.31.31\0"
+ VALUE "FileVersion", "6.1.33.33\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.2\0"
- VALUE "ProductDate", "Sun, 11 Apr 2010 10:58:24 GMT\0"
+ VALUE "ProductVersion", "6.1.2.1\0"
+ VALUE "ProductDate", "Sat, 07 May 2011 13:19:03 GMT\0"
END
END
--- a/vcmake.bat Wed Apr 06 21:17:27 2011 +0000
+++ b/vcmake.bat Sat May 07 13:19:45 2011 +0000
@@ -3,6 +3,6 @@
@REM type vcmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USEVC=1 %1 %2
+make.exe -N -f bc.mak -DUSEVC %1 %2