Author: mathk
Date: Fri Mar 21 16:04:10 2014
New Revision: 10608
URL: http://svn.gna.org/viewcvs/etoile?rev=10608&view=rev
Log:
Split PKRestrictionExpression file
Added:
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/Expressions/PKRestrictionExpression.st
Modified:
trunk/Etoile/Languages/ParserKit/GNUmakefile
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/LKInfo.plist
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/ParserKit.st
Modified: trunk/Etoile/Languages/ParserKit/GNUmakefile
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Languages/ParserKit/GNUmakefile?rev=10608&r1=10607&r2=10608&view=diff
==============================================================================
--- trunk/Etoile/Languages/ParserKit/GNUmakefile (original)
+++ trunk/Etoile/Languages/ParserKit/GNUmakefile Fri Mar 21 16:04:10 2014
@@ -41,6 +41,7 @@
Expressions/PKNAryComposeExpression.st\
Expressions/PKComposeExpression.st\
Expressions/PKEmptyExpression.st\
+ Expressions/PKRestrictionExpression.st\
Expressions/PKAnythingExpression.st\
Generator/PKParserAbstractGenerator.st
Added:
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/Expressions/PKRestrictionExpression.st
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/Expressions/PKRestrictionExpression.st?rev=10608&view=auto
==============================================================================
---
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/Expressions/PKRestrictionExpression.st
(added)
+++
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/Expressions/PKRestrictionExpression.st
Fri Mar 21 16:04:10 2014
@@ -0,0 +1,26 @@
+"
+ Restricted expressions are a quick hack to work around the fact that our
+ delegate based action syntax does not allow us to replace the parse match
with
+ a bound subexpression without jumping to a large number of hoops. (i.e. write
+ a delegate method that does nothing
+"
+
+PKComposeExpression subclass: PKRestrictionExpression [
+ | restriction |
+ initWithExp: aExp restriction: aRestriction [
+ super initWithExp: aExp.
+ restriction := aRestriction
+ ]
+
+ parseInput: list withCurrentParser: parser delegate: delegate [
+ | match |
+
+ match := exp parseInput: list withCurrentParser: parser.
+ match isSuccess ifTrue: [
+ match attachAction: (restriction restrictInEnvironment:
list environment)
+ ].
+ ^match
+ ]
+ description [ ^exp description, ' -> ', restriction description ]
+]
+
Modified:
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/LKInfo.plist
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/LKInfo.plist?rev=10608&r1=10607&r2=10608&view=diff
==============================================================================
Binary files - no diff available.
Modified:
trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/ParserKit.st
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/ParserKit.st?rev=10608&r1=10607&r2=10608&view=diff
==============================================================================
--- trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/ParserKit.st
(original)
+++ trunk/Etoile/Languages/ParserKit/ParserKit.bundle/Resources/ParserKit.st
Fri Mar 21 16:04:10 2014
@@ -255,30 +255,6 @@
============================================================================
"
-
-" Restricted expressions are a quick hack to work around the fact that our
- delegate based action syntax does not allow us to replace the parse match
with
- a bound subexpression without jumping to a large number of hoops. (i.e. write
- a delegate method that does nothing"
-PKComposeExpression subclass: PKRestrictionExpression [
- | restriction |
- initWithExp: aExp restriction: aRestriction [
- super initWithExp: aExp.
- restriction := aRestriction
- ]
-
- parseInput: list withCurrentParser: parser delegate: delegate [
- | match |
-
- match := exp parseInput: list withCurrentParser: parser.
- match isSuccess ifTrue: [
- match attachAction: (restriction restrictInEnvironment:
list environment)
- ].
- ^match
- ]
- description [ ^exp description, ' -> ', restriction description ]
-]
-
PKComposeExpression subclass: PKParameterizedExpression [
| predicate |
initWithExp: aExp predicate: pred [
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
