SHOW: Implement SHOW ENVIRONMENT.

[pspp] / src / language / expressions / generate.py

diff --git a/src/language/expressions/generate.py b/src/language/expressions/generate.py
index d700c46fff06bdbcee598a721fb4462178bd83ea..43fadb017d128d6cdefcd892626fc0e7ef6aabfd 100644 (file)
--- a/src/language/expressions/generate.py
+++ b/src/language/expressions/generate.py
@@ -51,9 +51,9 @@ def init_all_types():
 
         # Format types.
         Type.new_atom('format'),
-        Type.new_leaf('ni_format', 'const struct fmt_spec *',
+        Type.new_leaf('ni_format', 'struct fmt_spec',
                       'format', 'f', 'num_input_format'),
-        Type.new_leaf('no_format', 'const struct fmt_spec *',
+        Type.new_leaf('no_format', 'struct fmt_spec',
                       'format', 'f', 'num_output_format'),
 
         # Integer types.
@@ -870,7 +870,8 @@ def generate_optimize_inc():
             type_ = arg.type_
             c_type = type_.c_type
             if arg.idx is None:
-                func = 'get_%s_arg' % type_.atom
+                func = ('get_integer_arg' if type_.name == 'integer'
+                        else 'get_%s_arg' % type_.atom)
                 decls += ['%sarg_%s = %s (node, %s)'
                           % (c_type, name, func, arg_idx)]
             else: