From ef09fbe3b4be3d65979a0b65d97359c4ac6468ad Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 20 Jun 2016 16:13:58 -0700 Subject: [PATCH] factor: move tc-lisp-talk to unmaintained as it uses HEREDOC:. Fix morse. THINGS PARSE --- core/modern/modern.factor | 4 +++- demos/morse/morse.factor | 2 +- .../balanced-brackets/balanced-brackets.factor | 2 +- demos/talks/google-tech-talk/google-tech-talk.factor | 8 ++++---- {demos/talks => unmaintained}/tc-lisp-talk/authors.txt | 0 .../tc-lisp-talk/tc-lisp-talk.factor | 0 6 files changed, 9 insertions(+), 7 deletions(-) rename {demos/talks => unmaintained}/tc-lisp-talk/authors.txt (100%) rename {demos/talks => unmaintained}/tc-lisp-talk/tc-lisp-talk.factor (100%) diff --git a/core/modern/modern.factor b/core/modern/modern.factor index c4da4312ec..7f3f57f8a6 100644 --- a/core/modern/modern.factor +++ b/core/modern/modern.factor @@ -543,7 +543,9 @@ vocab-roots get [ vocabs-from reject-some-paths ] map concat { "specialized-arrays" "specialized-vectors" "math.blas.matrices" "math.blas.vectors" "math.vectors.simd" - "math.vectors.simd.cords" "game.debug" + "math.vectors.simd.cords" "game.debug" "gpu.util" "gpu.effects.blur" + "gpu.effects.step" "model-viewer" "terrain.shaders" "spheres" + "bunny.cel-shaded" "bunny.outlined" } diff [ modern-source-path dup . path>literals ] map-zip ]] \ No newline at end of file diff --git a/demos/morse/morse.factor b/demos/morse/morse.factor index d320114aa9..d2fc45f65d 100755 --- a/demos/morse/morse.factor +++ b/demos/morse/morse.factor @@ -112,7 +112,7 @@ PRIVATE> : morse> ( morse -- plain ) replace-underscores morse>sentence ; -SYNTAX: MORSE[[ "]]" parse-multiline-string morse> suffix! ; +SYNTAX: \ MORSE[[ "]]" parse-multiline-string morse> suffix! ; PRIVATE< diff --git a/demos/rosetta-code/balanced-brackets/balanced-brackets.factor b/demos/rosetta-code/balanced-brackets/balanced-brackets.factor index 7439ec86fe..e53ecc2d7c 100644 --- a/demos/rosetta-code/balanced-brackets/balanced-brackets.factor +++ b/demos/rosetta-code/balanced-brackets/balanced-brackets.factor @@ -27,7 +27,7 @@ in: rosetta-code.balanced-brackets str [ { { char: \[ [ 1 ] } - { char: ] [ -1 ] } + { char: \] [ -1 ] } [ drop 0 ] } case counter + counter! counter 0 < [ f ok! ] when diff --git a/demos/talks/google-tech-talk/google-tech-talk.factor b/demos/talks/google-tech-talk/google-tech-talk.factor index c34181e9f1..1affa41570 100644 --- a/demos/talks/google-tech-talk/google-tech-talk.factor +++ b/demos/talks/google-tech-talk/google-tech-talk.factor @@ -175,9 +175,9 @@ CONSTANT: google-slides "We define a mixin class for shapes, and add our existing data types as instances:" { $code "mixin: shape" - "INSTANCE: rectangle shape" ; - "INSTANCE: circle shape" ; - "INSTANCE: triangle shape" ; + "INSTANCE: rectangle shape" + "INSTANCE: circle shape" + "INSTANCE: triangle shape" } } { $slide "Object system" @@ -210,7 +210,7 @@ CONSTANT: google-slides { $code "TUPLE: parallelogram ... ;" "" - "INSTANCE: parallelogram shape" ; + "INSTANCE: parallelogram shape" "" "M: parallelogram area ... ;" "" diff --git a/demos/talks/tc-lisp-talk/authors.txt b/unmaintained/tc-lisp-talk/authors.txt similarity index 100% rename from demos/talks/tc-lisp-talk/authors.txt rename to unmaintained/tc-lisp-talk/authors.txt diff --git a/demos/talks/tc-lisp-talk/tc-lisp-talk.factor b/unmaintained/tc-lisp-talk/tc-lisp-talk.factor similarity index 100% rename from demos/talks/tc-lisp-talk/tc-lisp-talk.factor rename to unmaintained/tc-lisp-talk/tc-lisp-talk.factor