fix USING lines (#171)

accumulate and list-ops use math

Author: keiravillekode

bin/add-practice-exercise

@@ -78,8 +78,6 @@ module_name=$(echo "${slug}" | sed -r 's/(^|-)(\w)/\U\2/g')
 cat > "${exercise_dir}/.meta/generator.jl" << GENERATOR
 module ${module_name}
 
-const HEADER = "USING: ${slug} tools.test ;"
-
 function gen_test_case(case)
     error("TODO: implement gen_test_case for ${slug}")
 end

exercises/practice/accumulate/.meta/generator.jl

@@ -1,5 +1,7 @@
 module Accumulate
 
+const EXTRA_VOCABS = ["math"]
+
 const ACCUMULATORS = Dict(
     "(x) => x * x" => "[ dup * ]",
     "(x) => upcase(x)" => "[ >upper ]",

exercises/practice/accumulate/accumulate/accumulate-tests.factor

@@ -1,4 +1,4 @@
-USING: accumulate io kernel lexer tools.test unicode ;
+USING: accumulate io kernel lexer math tools.test unicode ;
 IN: accumulate.tests
 
 : STOP-HERE ( -- ) lexer get [ text>> length ] keep line<< ; parsing

exercises/practice/armstrong-numbers/.meta/example.factor

@@ -1,5 +1,5 @@
 USING: assocs kernel locals math math.functions math.order sequences ;
-IN: armstrong
+IN: armstrong-numbers
 
 :: digits ( x -- digits )
     x 10 /mod :> x! :> xs!

exercises/practice/armstrong-numbers/armstrong-numbers/armstrong-numbers.factor

@@ -1,5 +1,5 @@
 USING: kernel ;
-IN: armstrong
+IN: armstrong-numbers
 
 : armstrong? ( n -- ? )
     "unimplemented" throw ;

exercises/practice/list-ops/.meta/generator.jl

@@ -1,5 +1,7 @@
 module ListOps
 
+const EXTRA_VOCABS = ["math"]
+
 const WORD_NAMES = Dict(
     "append" => "list-append",
     "concat" => "list-concat",

exercises/practice/list-ops/list-ops/list-ops-tests.factor

@@ -1,4 +1,4 @@
-USING: io kernel lexer list-ops tools.test unicode ;
+USING: io kernel lexer list-ops math tools.test unicode ;
 IN: list-ops.tests
 
 : STOP-HERE ( -- ) lexer get [ text>> length ] keep line<< ; parsing

generator/generate.jl

@@ -99,14 +99,15 @@ const STOP_HERE_DEF = ": STOP-HERE ( -- ) lexer get [ text>> length ] keep line<
 
 title_of(slug) = join((uppercasefirst(w) for w in split(slug, '-')), ' ')
 
-function gen_header(cases, slug)
-    vocabs = [slug, "lexer", "kernel", "io", "tools.test", "unicode"]
-    sort!(vocabs)
+function gen_header(mod, slug)
+    base = String["io", "kernel", "lexer", slug, "tools.test", "unicode"]
+    extra = isdefined(mod, :EXTRA_VOCABS) ? collect(mod.EXTRA_VOCABS) : String[]
+    vocabs = sort!(unique!(vcat(base, extra)))
     return "USING: $(join(vocabs, " ")) ;\nIN: $(slug).tests"
 end
 
 function render_test_file(mod, cases, slug)
-    lines = String[gen_header(cases, slug), ""]
+    lines = String[gen_header(mod, slug), ""]
     push!(lines, STOP_HERE_DEF, "")
     if length(cases) > 1
         push!(lines, """"$(title_of(slug)):" print""", "")