From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 21 Sep 2009 04:02:49 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~5502
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=5cb34724b77f852cfbacd93529348b7314283874

Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	basis/classes/struct/struct-tests.factor
	basis/functors/functors-tests.factor
	basis/specialized-arrays/specialized-arrays-tests.factor
---

5cb34724b77f852cfbacd93529348b7314283874
diff --cc basis/classes/struct/struct-tests.factor
index a282eb75ee,b60bfa375b..a026417171
--- a/basis/classes/struct/struct-tests.factor
+++ b/basis/classes/struct/struct-tests.factor
@@@ -3,9 -3,11 +3,11 @@@ USING: accessors alien alien.c-types al
  assocs byte-arrays classes.struct classes.tuple.private
  combinators compiler.tree.debugger compiler.units destructors
  io.encodings.utf8 io.pathnames io.streams.string kernel libc
 -literals math mirrors multiline namespaces prettyprint
 +literals math mirrors namespaces prettyprint
  prettyprint.config see sequences specialized-arrays system
  tools.test parser lexer eval layouts ;
+ FROM: math => float ;
+ QUALIFIED-WITH: alien.c-types c
  SPECIALIZED-ARRAY: char
  SPECIALIZED-ARRAY: int
  SPECIALIZED-ARRAY: ushort
@@@ -181,14 -183,14 +183,14 @@@ STRUCT: struct-test-string-pt
      ] with-scope
  ] unit-test
  
- [ "USING: classes.struct ;
 -[ <" USING: alien.c-types classes.struct ;
++[ "USING: alien.c-types classes.struct ;
  IN: classes.struct.tests
  STRUCT: struct-test-foo
      { x char initial: 0 } { y int initial: 123 } { z bool } ;
 -"> ]
 +" ]
  [ [ struct-test-foo see ] with-string-writer ] unit-test
  
- [ "USING: classes.struct ;
 -[ <" USING: alien.c-types classes.struct ;
++[ "USING: alien.c-types classes.struct ;
  IN: classes.struct.tests
  UNION-STRUCT: struct-test-float-and-bits
      { f float initial: 0.0 } { bits uint initial: 0 } ;