Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
A few more things are parsing correctly.
Notably: The implied ^self is now working, some things have gotten simpler, and variables now work. Reformatted the odd formatting of testSourceParseMethodKeyword.
- Loading branch information
1 parent
3ff14b3
commit 6311a4b
Showing
19 changed files
with
48 additions
and
23 deletions.
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
packages/Mist-Compiler.package/MistGrammar.class/class/allowUnderscoreAssignment.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
as yet unclassified | ||
allowUnderscoreAssignment | ||
^ false |
2 changes: 1 addition & 1 deletion
2
packages/Mist-Compiler.package/MistGrammar.class/instance/methodSequence.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
grammar | ||
methodSequence | ||
^ super methodSequence ", (return / impliedReturnSelf)" | ||
^ super methodSequence , (return / impliedReturnSelf) |
4 changes: 2 additions & 2 deletions
4
packages/Mist-Compiler.package/MistGrammar.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
packages/Mist-Compiler.package/MistParser.class/instance/identifierToken.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
grammar | ||
identifierToken | ||
^ super identifierToken map: [ :token | token inputValue ] |
3 changes: 3 additions & 0 deletions
3
packages/Mist-Compiler.package/MistParser.class/instance/impliedReturnSelf.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
grammar | ||
impliedReturnSelf | ||
^ super impliedReturnSelf ==> [ :nodes | FogVariableReferenceNode variableName: 'self' ] |
3 changes: 3 additions & 0 deletions
3
packages/Mist-Compiler.package/MistParser.class/instance/keywordToken.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
grammar | ||
keywordToken | ||
^ super keywordToken map: [ :token | token inputValue ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 5 additions & 1 deletion
6
packages/Mist-Compiler.package/MistParser.class/instance/methodSequence.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
grammar | ||
methodSequence | ||
^ super methodSequence | ||
map: [ :a :pragmas :b :temporaries :c :morePragmas :d :statements ":returnStatement" | FogTempVarScopeNode temporaries: temporaries statements: statements "asOrderedCollection addLast: returnStatement" ] | ||
map: [ :a :pragmas :b :temporaries :c :morePragmas :d :statements :returnStatement | | ||
| allStatments | | ||
allStatements := statements asOrderedCollection. | ||
allStatements addLast: returnStatement. | ||
FogTempVarScopeNode temporaries: temporaries statements: allStatements ] |
2 changes: 1 addition & 1 deletion
2
packages/Mist-Compiler.package/MistParser.class/instance/temporaries.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
grammar | ||
temporaries | ||
^ super temporaries ==> [ :nodes | nodes second collect: [ :each | each inputValue ] ] | ||
^ super temporaries ==> [ :nodes | nodes second ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
packages/Mist-MacroFog.package/FogVariableReferenceNode.class/class/variableName..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
instance creation | ||
variableName: aString | ||
^ self new variableName: aString |
3 changes: 3 additions & 0 deletions
3
packages/Mist-MacroFog.package/FogVariableReferenceNode.class/instance/variableName..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
initialization | ||
variableName: aString | ||
variableName := aString |
4 changes: 2 additions & 2 deletions
4
packages/Mist-MacroFog.package/FogVariableReferenceNode.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"class" : { | ||
}, | ||
"variableName:" : "MartinMcClure 9/14/2015 22:03" }, | ||
"instance" : { | ||
} } | ||
"variableName:" : "MartinMcClure 9/14/2015 22:04" } } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
(name 'Mist-MacroFog-MartinMcClure.2' message 'Got a bit further on parsing.' id '4070ac8f-0837-4d2d-aa91-bd81f6b2fcd0' date '13 September 2015' time '10:04:25.258538 pm' author 'MartinMcClure' ancestors ((name 'Mist-MacroFog-MartinMcClure.1' message 'The beginnings of a parser to parse into Macro Fog nodes.' id '1374cf2f-f54c-4e7d-9bbb-c56d835a6c84' date '13 September 2015' time '1:32:09.395157 pm' author 'MartinMcClure' ancestors () stepChildren ())) stepChildren ()) | ||
(name 'Mist-MacroFog-MartinMcClure.3' message 'A few more things are parsing correctly.' id 'b3706c66-05e9-4ee1-acaf-82e967672700' date '14 September 2015' time '10:53:59.871746 pm' author 'MartinMcClure' ancestors ((name 'Mist-MacroFog-MartinMcClure.2' message 'Got a bit further on parsing.' id '4070ac8f-0837-4d2d-aa91-bd81f6b2fcd0' date '13 September 2015' time '10:04:25.258538 pm' author 'MartinMcClure' ancestors ((name 'Mist-MacroFog-MartinMcClure.1' message 'The beginnings of a parser to parse into Macro Fog nodes.' id '1374cf2f-f54c-4e7d-9bbb-c56d835a6c84' date '13 September 2015' time '1:32:09.395157 pm' author 'MartinMcClure' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters