Merge jv
authorMerge Script
Fri, 23 Sep 2016 07:02:18 +0200
branchjv
changeset 3986 5dadef06fe27
parent 3983 47ba0678c862 (current diff)
parent 3985 2b2a2ee12cdc (diff)
child 3988 dc67db6ea87b
Merge
Parser.st
--- a/MessageNode.st	Thu Sep 22 07:06:29 2016 +0200
+++ b/MessageNode.st	Fri Sep 23 07:02:18 2016 +0200
@@ -1158,7 +1158,6 @@
     ]
 ! !
 
-
 !MessageNode methodsFor:'evaluation'!
 
 evaluateForCascadeIn:anEnvironment
@@ -1235,7 +1234,6 @@
     ^ selector asSymbol
 ! !
 
-
 !MessageNode methodsFor:'optimized code generation'!
 
 codeAndIfElseOn:aStream inBlock:b valueNeeded:valueNeeded for:aCompiler
@@ -2456,7 +2454,7 @@
             loopCount := nil.
         ] ifTrue:[
             loopCount <= 0 ifTrue:[
-                "/ thats it - all we need is the receiver on the stack
+                "/ that's it - all we need is the receiver on the stack
                 valueNeeded ifTrue:[
                     receiver codeOn:aStream inBlock:b for:aCompiler.
                 ].
--- a/Parser.st	Thu Sep 22 07:06:29 2016 +0200
+++ b/Parser.st	Fri Sep 23 07:02:18 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -2899,7 +2897,7 @@
                     "/ note from cg to stefan: this is something that lint must report - not the compiler.
                     "/ if not implemented in all subclasses, it's a bug of the subclass;
                     "/ not a bug here - that message sent here is perfectly correct. 
-                    "/ (it is very annoying for a framework developper to get
+                    "/ (it is very annoying for a framework developer to get
                     "/  error messages for bugs which are not his)
 "/                    (self checkIfAllSubclassesOf:cls implement:selector) ifFalse:[
 "/                        "if not all subclasses implement the selector - this is a possible bug"
@@ -5387,6 +5385,7 @@
     selector := aParser selector.
 ! !
 
+
 !Parser methodsFor:'obsolete'!
 
 correctByDeleting