treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

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

diff --git a/src/language/expressions/generate.pl b/src/language/expressions/generate.pl
index 228095db9443c098f8929c9da6fcf97e002cbf1f..188d4eb11cc5c86ef3acfe4d868d4b6a6f4582db 100644 (file)
--- a/src/language/expressions/generate.pl
+++ b/src/language/expressions/generate.pl
@@ -561,8 +561,8 @@ sub parse_arg {
            $arg{IDX} = force ('id');
            if (match ('*')) {
                $arg{TIMES} = force ('int');
-               die "multiplication factor must be positive"
-                 if $arg{TIMES} < 1;
+               die "multiplication factor must be two"
+                 if $arg{TIMES} != 2;
            } else {
                $arg{TIMES} = 1;
            }
@@ -749,7 +749,7 @@ sub print_range {
     my ($prefix, $first, $last) = @_;
     print "    ${prefix}_first = $first,\n";
     print "    ${prefix}_last = $last,\n";
-    print "    ${prefix}_cnt = ${prefix}_last - ${prefix}_first + 1";
+    print "    n_${prefix} = ${prefix}_last - ${prefix}_first + 1";
 }
 
 sub print_predicate {
@@ -786,7 +786,7 @@ sub generate_optimize_inc {
                my ($func) = "get_$type->{ATOM}_arg";
                push (@decls, "${ctype}arg_$name = $func (node, $arg_idx)");
            } else {
-               my ($decl) = "size_t arg_$idx = node->arg_cnt";
+               my ($decl) = "size_t arg_$idx = node->n_args";
                $decl .= " - $arg_idx" if $arg_idx;
                push (@decls, $decl);