From cca32d4cbd9abac0303fd2d83b8446a591f44081 Mon Sep 17 00:00:00 2001 From: "Brian T. Rice" Date: Tue, 1 Feb 2011 00:14:15 -0800 Subject: [PATCH] Removed the `bootstrapping macro. --- src/lib/macro.slate | 7 +------ src/syntax/lexer.slate | 7 +++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/lib/macro.slate b/src/lib/macro.slate index 6fe5545..ca09d4f 100644 --- a/src/lib/macro.slate +++ b/src/lib/macro.slate @@ -239,12 +239,7 @@ Types Member traits compareAndHashUsingSlots: #{#elements}. Types Block traits compareAndHashUsingSlots: #{#resultType. #argumentTypes}. Types Range traits compareAndHashUsingSlots: #{#type. #start. #end}. Types Array traits compareAndHashUsingSlots: #{#type}. -) `bootstrapping. - -n@(nodes Node traits) bootstrapping -"Override of the bootstrapping macro so that source marked that way no longer -has any effect when evaluated." -[n surroundings Literal Nil]. +). x@(nodes Node traits) swapWith: y@(nodes Node traits) &environment: env [ diff --git a/src/syntax/lexer.slate b/src/syntax/lexer.slate index 95f9505..181bd9c 100644 --- a/src/syntax/lexer.slate +++ b/src/syntax/lexer.slate @@ -9,8 +9,6 @@ Also, debugging information is stored for now in terms of the line number that the current stream position has reached." Lexer traits define: #WordTerminatingTokens -> '()[]{}@,.|!#$`"\'%'. -(Syntax import: #Lexer from: here) `bootstrapping. - l@(Lexer traits) on: stream "Target the lexer to the particular stream and initialize it." [ @@ -26,7 +24,7 @@ l@(Lexer traits) reset l@(Lexer traits) showTokensFrom: src [ - (l newOn: src) do: [| :x | inform: x printString] + (l newOn: src) do: [| :x | inform: x printString]. ]. l@(Lexer traits) isEndOfLine: char [char == $\n]. @@ -241,7 +239,8 @@ l@(Lexer traits) read: type@(tokens Selector traits) [| :result | l hasMoreCharacters /\ [l peekCharacter isDigit] ifFalse: [l nextWordCharactersInto: result]] writingAs: '') isEmpty - ifFalse: [type for: result] + ifTrue: [] + ifFalse: [type for: result] ]. l@(Lexer traits) readLiteralPastHash -- 2.11.4.GIT