From acbe85f0f4a28b2b54e7ab8d56a2284514166d3d Mon Sep 17 00:00:00 2001 From: Doug Coleman <doug.coleman@gmail.com> Date: Mon, 3 Oct 2011 17:13:20 -0700 Subject: [PATCH] Rename the STRUCT: point word to something else because it conflicts with other unit tests which define a point word in scratchpad. The struct point is redefined to a tuple point and causes the macro-expansion to error out now that structs are properly reset, so instead we just give it a unique name so it doesnt get redefined. Perhaps examples should define their own vocabularies instead of using scratchpad. --- basis/alien/data/data-docs.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/alien/data/data-docs.factor b/basis/alien/data/data-docs.factor index cd394916c4..ae8556fa7d 100644 --- a/basis/alien/data/data-docs.factor +++ b/basis/alien/data/data-docs.factor @@ -66,10 +66,10 @@ classes.struct kernel math math.functions prettyprint ; IN: scratchpad -STRUCT: point { x int } { y int } ; +STRUCT: test-point { x int } { y int } ; : scoped-allocation-test ( -- x ) - { point } [ + { test-point } [ 3 >>x 4 >>y [ x>> sq ] [ y>> sq ] bi + sqrt ] with-scoped-allocation ;