From e5e6faf3857c4cfe8e119c682f1eb8d25a4a32b0 Mon Sep 17 00:00:00 2001 From: "Brian T. Rice" Date: Mon, 31 Jan 2011 21:10:37 -0800 Subject: [PATCH] Adjusted the image bootstrap to macroExpand before assembling the main kernel method, thus removing the possibility of those macros modifying the kernel method. --- src/mobius/build.slate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mobius/build.slate b/src/mobius/build.slate index 711458d..308e640 100644 --- a/src/mobius/build.slate +++ b/src/mobius/build.slate @@ -238,9 +238,9 @@ def@(ImageDefinition traits) generate [| :each | File newNamed: def bootstrapDirectory ; '/' ; each]) do: [| :file | inform: 'Parsing: %r', file locator. - file mode := file Read. file sessionDo: - [| :file | (Parser newOn: file ASCIIReader) >> out]]] + [| :file | (Parser newOn: file ASCIIReader) do: [| :node | out nextPut: node macroExpand]] + &mode: file Read]] writingAs: bootBlock statements. inform: 'Building image: %r', def filename. builder generateImageBooting: bootBlock withPrims: def primitives. -- 2.11.4.GIT