# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1416865496 0
# Node ID 77c414db3ccab708538b600820ed9fe0e78af959
# Parent  f3b99c7c1b20beecd5be7fc206de070cc62b2f12
Post merge fixes to make tests pass.

diff -r f3b99c7c1b20 -r 77c414db3cca parsers/smalltalk/extensions.st
--- a/parsers/smalltalk/extensions.st	Mon Nov 24 11:38:11 2014 +0000
+++ b/parsers/smalltalk/extensions.st	Mon Nov 24 21:44:56 2014 +0000
@@ -3,11 +3,13 @@
 !PPParser methodsFor:'*petitsmalltalk-operations'!
 
 smalltalkToken
-	| ws |
-	ws := PPSmalltalkWhitespaceParser new.
-	^ ((ws, ((PPTokenParser on: self) tokenClass: PPSmalltalkToken; yourself), ws) ==> #second)
-		name: 'trimmingToken';
-		yourself
+        | ws |
+        ws := PPSmalltalkWhitespaceParser new.
+        ^ ((ws, ((PPTokenParser on: self) tokenClass: PPSmalltalkToken; yourself), ws) ==> #second)
+                propertyAt: 'trimmingToken' put: true;
+                yourself
+
+    "Modified: / 24-11-2014 / 21:36:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !RBProgramNode methodsFor:'*petitsmalltalk-accessing'!