From 22955945263684fb85446c6ec91d707352553cee Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Thu, 17 Jan 2008 23:06:32 -0800
Subject: [PATCH] Remove USE-IF: again
---
core/syntax/syntax-docs.factor | 6 ------
core/syntax/syntax.factor | 1 -
extra/opengl/gl/gl.factor | 5 ++---
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor
index f4efc3b6bb..9cf9647e41 100755
--- a/core/syntax/syntax-docs.factor
+++ b/core/syntax/syntax-docs.factor
@@ -363,12 +363,6 @@ HELP: USE:
{ $description "Adds a new vocabulary at the front of the search path. Subsequent word lookups by the parser will search this vocabulary first." }
{ $errors "Throws an error if the vocabulary does not exist." } ;
-HELP: USE-IF:
-{ $syntax "USE-IF: word vocabulary" }
-{ $values { "word" "a word with stack effect " { $snippet "( -- ? )" } } { "vocabulary" "a vocabulary name" } }
-{ $description "Adds " { $snippet "vocabulary" } " at the front of the search path if " { $snippet "word" } " evaluates to a true value." }
-{ $errors "Throws an error if the vocabulary does not exist." } ;
-
HELP: USING:
{ $syntax "USING: vocabularies... ;" }
{ $values { "vocabularies" "a list of vocabulary names" } }
diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor
index de627358e4..7616f6e64b 100755
--- a/core/syntax/syntax.factor
+++ b/core/syntax/syntax.factor
@@ -46,7 +46,6 @@ IN: bootstrap.syntax
] define-syntax
"USE:" [ scan use+ ] define-syntax
- "USE-IF:" [ scan-word execute scan swap [ use+ ] [ drop ] if ] define-syntax
"USING:" [ ";" parse-tokens add-use ] define-syntax
diff --git a/extra/opengl/gl/gl.factor b/extra/opengl/gl/gl.factor
index 4a9d9c84d5..071fbc45e7 100644
--- a/extra/opengl/gl/gl.factor
+++ b/extra/opengl/gl/gl.factor
@@ -3,9 +3,8 @@
! This file is based on the gl.h that comes with xorg-x11 6.8.2
-USING: alien alien.syntax kernel sequences system words ;
-USE-IF: windows? opengl.gl.windows
-USE-IF: unix? opengl.gl.unix
+USING: alien alien.syntax kernel parser sequences system words ;
+<< windows? "opengl.gl.windows" "opengl.gl.unix" ? use+ >>
IN: opengl.gl