From a413d2da1f9ba43287ae7f03ac389f514098c8b1 Mon Sep 17 00:00:00 2001 From: "Brian T. Rice" Date: Sun, 2 Jan 2011 00:13:09 -0800 Subject: [PATCH] Typo fix for token code and some code formatting. --- src/lib/macro.slate | 46 +++++++++++++++++++++++----------------------- src/mobius/build.slate | 4 ++-- src/syntax/quote.slate | 1 - src/syntax/token.slate | 2 +- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/lib/macro.slate b/src/lib/macro.slate index fe62d6e..88cf6df 100644 --- a/src/lib/macro.slate +++ b/src/lib/macro.slate @@ -65,9 +65,9 @@ message@(nodes KeywordMessage traits) setTo: val paren@(nodes Parenthesis traits) setTo: val "Transforms the last statement into an assignment." [ - paren statements size caseOf: - {0 -> [paren]. - 1 -> [paren statements last setTo: val] + paren statements size caseOf: { + 0 -> [paren]. + 1 -> [paren statements last setTo: val] } otherwise: [| result | (result: paren copy) statements at: result statements indexLast put: @@ -78,26 +78,26 @@ paren@(nodes Parenthesis traits) setTo: val array@(nodes Array traits) setTo: vals &environment: env "Performs a multiple-assignment." [ - array statements size caseOf: - {0 -> [vals]. - 1 -> [array statements last setTo: `(vals `unquote first)] - } otherwise: - [| result tmpVar | - result: array copy. - env - ifNil: - [TODO: 'Can\'t handle this outside of a block context.'] - ifNotNil: - [tmpVar: ((vals is: nodes LoadVariable) - ifTrue: [vals variable] ifFalse: [env addVariable]). - "result statements: array statements collectWithIndex:" - array statements doWithIndex: - [| :statement :index | - result statements at: index put: - (statement setTo: - (nodes KeywordMessage sending: #at: to: - {tmpVar load. nodes Literal for: index}))]. - {tmpVar store: vals. result} as: nodes Parenthesis]] + array statements size caseOf: { + 0 -> [vals]. + 1 -> [array statements last setTo: `(vals `unquote first)] + } otherwise: + [| result tmpVar | + result: array copy. + env + ifNil: + [TODO: 'Can\'t handle this outside of a block context.'] + ifNotNil: + [tmpVar: ((vals is: nodes LoadVariable) + ifTrue: [vals variable] ifFalse: [env addVariable]). + "result statements: array statements collectWithIndex:" + array statements doWithIndex: + [| :statement :index | + result statements at: index put: + (statement setTo: + (nodes KeywordMessage sending: #at: to: + {tmpVar load. nodes Literal for: index}))]. + {tmpVar store: vals. result} as: nodes Parenthesis]] ]. load@(nodes LoadVariable traits) defaultsTo: default diff --git a/src/mobius/build.slate b/src/mobius/build.slate index 0238abf..af7219d 100644 --- a/src/mobius/build.slate +++ b/src/mobius/build.slate @@ -239,8 +239,8 @@ def@(ImageDefinition traits) generate inform: 'Parsing: %r', file locator. file mode := file Read. file sessionDo: - [| :file | (Parser newOn: file ASCIIReader) >> out]] - ] writingAs: bootBlock statements. + [| :file | (Parser newOn: file ASCIIReader) >> out]]] + writingAs: bootBlock statements. inform: 'Building image: %r', def filename. builder generateImageBooting: bootBlock withPrims: def primitives. (File newNamed: def filename &mode: File CreateWrite) sessionDo: diff --git a/src/syntax/quote.slate b/src/syntax/quote.slate index 7f9bf91..211e927 100644 --- a/src/syntax/quote.slate +++ b/src/syntax/quote.slate @@ -141,4 +141,3 @@ _@(nodes Macro traits) sending: _@#block isQuotedBy: label expr@(nodes Node traits) block "An unquote macro that wraps the supplied expression into a Block." [`(nodes Block newFor: expr `unquote)]. - diff --git a/src/syntax/token.slate b/src/syntax/token.slate index dd2b8ca..5f8c642 100644 --- a/src/syntax/token.slate +++ b/src/syntax/token.slate @@ -74,7 +74,7 @@ parser nextFrom: token@(tokens Selector traits) ifTrue: [nodes Resend clone] ifFalse: [nodes UnaryMessage sending: token value to: {nodes ImplicitArgument}]] - ifNotNilDo: #load `er + ifNotNilDo: #load `er] ]. s@(tokens Selector traits) messageType -- 2.11.4.GIT