# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1441675425 -3600
# Node ID 694ad2f97c65c435889f12ac9bc49e206919e3c2
# Parent  16e8536f5cfbe628cf04dbea55dbdfc4b30f388d# Parent  610131174c0ff6525dca0a9219055deb185b6b02
Merge

diff -r 16e8536f5cfb -r 694ad2f97c65 compiler/benchmarks/stx_goodies_petitparser_compiler_benchmarks.st
--- a/compiler/benchmarks/stx_goodies_petitparser_compiler_benchmarks.st	Mon Sep 07 11:53:38 2015 +0100
+++ b/compiler/benchmarks/stx_goodies_petitparser_compiler_benchmarks.st	Tue Sep 08 02:23:45 2015 +0100
@@ -34,6 +34,27 @@
 
     "Created: / 03-10-2014 / 01:47:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 24-11-2014 / 00:08:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+monticelloSplicemap
+    "Return a splicemap for this package. This is used to forge a 
+     'fake' ancestor when generating ancestry information out of 
+     Mercurial (or anyt other) history. This should make merging 
+     back into Squeak/Pharo a little easier as Monticello can (in theory)
+     find a proper ancestor. 
+
+     All this requires monticelloSplicemap being updated each time a code
+     is merged from Monticello.
+
+     The format of splicemap is a flat array of pairs 
+     (commit id, MCVersionInfo to splice) as literal encoding.
+    "
+
+    ^ #(
+        #(HGChangesetId 'f6f68d32de73') #(MCVersionInfo name: 'PetitCompiler-Benchmarks-JanKurs.19' id: '1c342fdb-8ddd-4104-9c47-a8f589c51694' date: '2015-08-24' time: '11:48:47.045' author: 'JanKurs' message: '### Cleanup
+- shadow variables removed')
+
+    )
 ! !
 
 !stx_goodies_petitparser_compiler_benchmarks class methodsFor:'description'!
diff -r 16e8536f5cfb -r 694ad2f97c65 compiler/tests/extras/PPCAbstractParserTest.st
--- a/compiler/tests/extras/PPCAbstractParserTest.st	Mon Sep 07 11:53:38 2015 +0100
+++ b/compiler/tests/extras/PPCAbstractParserTest.st	Tue Sep 08 02:23:45 2015 +0100
@@ -9,6 +9,7 @@
 	category:'PetitCompiler-Extras-Tests-Support'
 !
 
+
 !PPCAbstractParserTest class methodsFor:'resources'!
 
 resources
@@ -119,3 +120,10 @@
     "Created: / 29-07-2015 / 16:33:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!PPCAbstractParserTest class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
diff -r 16e8536f5cfb -r 694ad2f97c65 compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st
--- a/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Mon Sep 07 11:53:38 2015 +0100
+++ b/compiler/tests/extras/stx_goodies_petitparser_compiler_tests_extras.st	Tue Sep 08 02:23:45 2015 +0100
@@ -61,6 +61,27 @@
 
     "Created: / 03-10-2014 / 01:47:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 10-05-2015 / 06:27:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+monticelloSplicemap
+    "Return a splicemap for this package. This is used to forge a 
+     'fake' ancestor when generating ancestry information out of 
+     Mercurial (or anyt other) history. This should make merging 
+     back into Squeak/Pharo a little easier as Monticello can (in theory)
+     find a proper ancestor. 
+
+     All this requires monticelloSplicemap being updated each time a code
+     is merged from Monticello.
+
+     The format of splicemap is a flat array of pairs 
+     (commit id, MCVersionInfo to splice) as literal encoding.
+    "
+
+    ^ #(
+        #(HGChangesetId 'f6f68d32de73') #(MCVersionInfo name: 'PetitCompiler-Extras-Tests-JanKurs.29' id: 'ea1dbb67-f884-4237-8f34-adb0677c0954' date: '2015-08-24' time: '11:36:52.503' author: 'JanKurs' message: '- Some more tests
+- Better naming for PPSmalltalkParser')
+
+    )
 ! !
 
 !stx_goodies_petitparser_compiler_tests_extras class methodsFor:'description'!
diff -r 16e8536f5cfb -r 694ad2f97c65 compiler/tests/stx_goodies_petitparser_compiler_tests.st
--- a/compiler/tests/stx_goodies_petitparser_compiler_tests.st	Mon Sep 07 11:53:38 2015 +0100
+++ b/compiler/tests/stx_goodies_petitparser_compiler_tests.st	Tue Sep 08 02:23:45 2015 +0100
@@ -34,6 +34,27 @@
 
     "Created: / 03-10-2014 / 01:47:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 26-10-2014 / 01:27:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+monticelloSplicemap
+    "Return a splicemap for this package. This is used to forge a 
+     'fake' ancestor when generating ancestry information out of 
+     Mercurial (or anyt other) history. This should make merging 
+     back into Squeak/Pharo a little easier as Monticello can (in theory)
+     find a proper ancestor. 
+
+     All this requires monticelloSplicemap being updated each time a code
+     is merged from Monticello.
+
+     The format of splicemap is a flat array of pairs 
+     (commit id, MCVersionInfo to splice) as literal encoding.
+    "
+
+    ^ #(
+        #(HGChangesetId 'f6f68d32de73') #(MCVersionInfo name: 'PetitCompiler-Tests-JanKurs.116' id: '549e0927-358a-4a1b-8270-050ccfcb4217' date: '2015-08-24' time: '11:37:54.332' author: 'JanKurs' message: '- More tests for Scanner
+- Scanner workflow tests (i.e. scan_XY, token_XY, consume_XY)...')
+
+    )
 ! !
 
 !stx_goodies_petitparser_compiler_tests class methodsFor:'description'!