X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fprivate.h;h=3cf7a2c73213f581019f43beaa6ebe17b3bfe0a1;hb=339f1956cc727eda788638644ef93ab7852b31cd;hp=92adef85b3f401429964ba808c3fa3d3c24c1360;hpb=ff7ae14592cbdbebc4e4322424db95663ea7e166;p=pspp

diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h
index 92adef85b3..3cf7a2c732 100644
--- a/src/language/expressions/private.h
+++ b/src/language/expressions/private.h
@@ -72,7 +72,7 @@ struct operation
     const char *prototype;
     enum operation_flags flags;
     atom_type returns;
-    int arg_cnt;
+    int n_args;
     atom_type args[EXPR_ARG_MAX];
     int array_min_elems;
     int array_granularity;
@@ -123,9 +123,9 @@ struct format_node
 struct composite_node
   {
     operation_type type;   /* One of OP_*. */
-    size_t arg_cnt;             /* Number of arguments. */
-    union any_node **args;	/* Arguments. */
-    size_t min_valid;           /* Min valid array args to get valid result. */
+    size_t n_args;         /* Number of arguments. */
+    union any_node **args; /* Arguments. */
+    size_t min_valid;      /* Min valid array args to get valid result. */
   };
 
 /* Any node. */
@@ -161,7 +161,7 @@ struct expression
 
     union operation_data *ops;  /* Expression data. */
     operation_type *op_types;   /* ops[] element types (for debugging). */
-    size_t op_cnt, op_cap;      /* Number of ops, amount of allocated space. */
+    size_t n_ops, allocated_ops; /* Number of ops, amount of allocated space. */
 
     double *number_stack;       /* Evaluation stack: numerics, Booleans. */
     struct substring *string_stack; /* Evaluation stack: strings. */