diff --git a/core/modern/modern.factor b/core/modern/modern.factor index 7f3f57f8a6..db8f02f4bc 100644 --- a/core/modern/modern.factor +++ b/core/modern/modern.factor @@ -335,7 +335,7 @@ MACRO:: read-matched ( ch -- quot: ( lexer tag -- slice' ) ) lexer n>> :> n lexer read-string-payload :> ( n' string slice ) n' [ n string string-expected-got-eof ] unless - n n' 1 - string >string + n n' 1 - string n' 1 - n' string tag 1 cut-slice* dquote-literal make-matched-literal ; @@ -548,4 +548,15 @@ vocab-roots get [ vocabs-from reject-some-paths ] map concat "bunny.cel-shaded" "bunny.outlined" } diff [ modern-source-path dup . path>literals ] map-zip + +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" "gpu.util" "gpu.effects.blur" + "gpu.effects.step" "model-viewer" "terrain.shaders" "spheres" + "bunny.cel-shaded" "bunny.outlined" +} diff +[ modern-source-path ] map +[ ] rewrite-paths ]] \ No newline at end of file diff --git a/core/modern/out/out-tests.factor b/core/modern/out/out-tests.factor index 550371841a..c427736ade 100644 --- a/core/modern/out/out-tests.factor +++ b/core/modern/out/out-tests.factor @@ -59,4 +59,6 @@ in: modern.out.tests [ "( a: ( quot: ( b -- c ) -- d ) -- e )" [ [ ] rewrite-string ] keep sequence= ] unit-test { t } [ "<{ ptx-2op-instruction ptx-float-ftz }" rewrite-same-string ] unit-test -{ t } [ "foo<{ ptx-2op-instruction ptx-float-ftz }" rewrite-same-string ] unit-test \ No newline at end of file +{ t } [ "foo<{ ptx-2op-instruction ptx-float-ftz }" rewrite-same-string ] unit-test + +{ t } [ [[ [ dup 0 > [ number>string ] [ drop "No more" ] if ] ]] [ ] rewrite-same-string ] unit-test \ No newline at end of file