contrib/objcwrapper: move `model` to an attribute of `CodeGenerator`

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/objcwrapper/src/objc_generator.nit b/contrib/objcwrapper/src/objc_generator.nit
index db273cb..6ca50a2 100644 (file)
--- a/contrib/objcwrapper/src/objc_generator.nit
+++ b/contrib/objcwrapper/src/objc_generator.nit
@@ -63,10 +63,17 @@ redef class Sys
        end
 end
 
+# Wrapper generator
 class CodeGenerator
+
+       # `ObjcModel` to wrap
+       var model: ObjcModel
+
        # Generate Nit code to wrap `classes`
-       fun generate(classes: Array[ObjcClass])
+       fun generate
        do
+               var classes = model.classes
+
                # Open specified path or stdin
                var file
                var path = opt_output.value

diff --git a/contrib/objcwrapper/src/objcwrapper.nit b/contrib/objcwrapper/src/objcwrapper.nit
index cc527e7..0e3cb18 100644 (file)
--- a/contrib/objcwrapper/src/objcwrapper.nit
+++ b/contrib/objcwrapper/src/objcwrapper.nit
@@ -41,7 +41,6 @@ Options:"""
 end
 
 var v = new ObjcVisitor
-var g = new CodeGenerator
 
 for arg in opts.rest do
        # Read input
@@ -64,4 +63,5 @@ for arg in opts.rest do
        v.enter_visit root
 end
 
-g.generate v.model.classes
+var g = new CodeGenerator(v.model)
+g.generate