class: Parser
changed: #withSelf:parseExpression:onError:notifying:ignoreErrors:ignoreWarnings:inNameSpace:
--- a/Parser.st Mon Aug 19 13:15:05 2013 +0200
+++ b/Parser.st Mon Aug 19 17:32:26 2013 +0200
@@ -1835,7 +1835,7 @@
inNameSpace:aNameSpaceOrNil
!
-withSelf:anObject parseExpression:aString onError:errorValue notifying:someOne ignoreErrors:ignoreErrors ignoreWarnings:ignoreWarnings inNameSpace:aNameSpaceOrNil
+withSelf:anObject parseExpression:aStringOrStream onError:errorValue notifying:someOne ignoreErrors:ignoreErrors ignoreWarnings:ignoreWarnings inNameSpace:aNameSpaceOrNil
"parse aString as an expression with self set to anObject;
Return the parseTree (if ok), nil (for an empty string
or comment only ) or errorValue (syntactic error).
@@ -1846,17 +1846,17 @@
|parser tree|
- aString isNil ifTrue:[^ nil].
-
- parser := self for:(ReadStream on:aString).
+ aStringOrStream isNil ifTrue:[^ nil].
+
+ parser := self for:(aStringOrStream readStream).
tree := parser
- parseExpressionWithSelf:anObject
- notifying:someOne
- ignoreErrors:ignoreErrors
- ignoreWarnings:ignoreWarnings
- inNameSpace:aNameSpaceOrNil.
+ parseExpressionWithSelf:anObject
+ notifying:someOne
+ ignoreErrors:ignoreErrors
+ ignoreWarnings:ignoreWarnings
+ inNameSpace:aNameSpaceOrNil.
tree == #Error ifTrue:[
- ^ errorValue value
+ ^ errorValue value
].
^ tree
@@ -10894,11 +10894,11 @@
!Parser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.772 2013-08-10 11:23:29 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.773 2013-08-19 15:32:26 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.772 2013-08-10 11:23:29 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.773 2013-08-19 15:32:26 cg Exp $'
!
version_SVN