cuda: fix CUDA-LIBRARY: to take a proper path that could have spaces in it

diff --git a/extra/cuda/demos/hello-world/hello-world.factor b/extra/cuda/demos/hello-world/hello-world.factor
index d486c1cb831bdb60afb0ee08b082822d323e75ac..ef410df80b7f52c5042b7832ebee57f48b956a22 100644 (file)
--- a/extra/cuda/demos/hello-world/hello-world.factor
+++ b/extra/cuda/demos/hello-world/hello-world.factor
@@ -6,7 +6,7 @@ destructors io io.encodings.string io.encodings.utf8 kernel locals
 math math.parser namespaces sequences strings ;
 IN: cuda.demos.hello-world
 
-CUDA-LIBRARY: hello cuda32 vocab:cuda/demos/hello-world/hello.ptx
+CUDA-LIBRARY: hello cuda32 "vocab:cuda/demos/hello-world/hello.ptx"
 
 CUDA-FUNCTION: helloWorld ( char* string-ptr )
 

diff --git a/extra/cuda/demos/prefix-sum/prefix-sum.factor b/extra/cuda/demos/prefix-sum/prefix-sum.factor
index 66a238f6613216bf7b44457219505e3f76537ac6..cbda5e8883029c1d97bd6032481398281ac6e94e 100644 (file)
--- a/extra/cuda/demos/prefix-sum/prefix-sum.factor
+++ b/extra/cuda/demos/prefix-sum/prefix-sum.factor
@@ -3,7 +3,7 @@
 USING: alien.c-types cuda cuda.contexts cuda.libraries cuda.syntax locals ;
 IN: cuda.demos.prefix-sum
 
-CUDA-LIBRARY: prefix-sum cuda32 vocab:cuda/demos/prefix-sum/prefix-sum.ptx
+CUDA-LIBRARY: prefix-sum cuda32 "vocab:cuda/demos/prefix-sum/prefix-sum.ptx"
 
 CUDA-FUNCTION: prefix_sum_block ( uint* in, uint* out, uint n )
 

diff --git a/extra/cuda/syntax/syntax.factor b/extra/cuda/syntax/syntax.factor
index 001eb7d5602042c54ca5ee4817aaea4278a071ca..3b1cad591f31be3ba97d5943bea0f7cd585d58d7 100644 (file)
--- a/extra/cuda/syntax/syntax.factor
+++ b/extra/cuda/syntax/syntax.factor
@@ -5,7 +5,7 @@ fry kernel lexer namespaces parser ;
 IN: cuda.syntax
 
 SYNTAX: CUDA-LIBRARY:
-    scan-token scan-word scan-token
+    scan-token scan-word scan-object
     '[ _ _ add-cuda-library ]
     [ current-cuda-library set-global ] bi ;