Eliminated global variable current_dataset.

[pspp-builds.git] / src / language / expressions / generate.pl

diff --git a/src/language/expressions/generate.pl b/src/language/expressions/generate.pl
index 4ad1764b1c3c96152703b90e8a22afb85f8120db..6eab24365d624174523872fa6b7e3a01bdc096cc 100644 (file)
--- a/src/language/expressions/generate.pl
+++ b/src/language/expressions/generate.pl
@@ -68,7 +68,7 @@ sub init_all_types {
     init_type ('number', 'any', C_TYPE => 'double',
               ATOM => 'number', MANGLE => 'n', HUMAN_NAME => 'num',
               STACK => 'ns', MISSING_VALUE => 'SYSMIS');
-    init_type ('string', 'any', C_TYPE => 'struct fixed_string',
+    init_type ('string', 'any', C_TYPE => 'struct substring',
               ATOM => 'string', MANGLE => 's', HUMAN_NAME => 'string',
               STACK => 'ss', MISSING_VALUE => 'empty_string');
     init_type ('boolean', 'any', C_TYPE => 'double',
@@ -111,6 +111,8 @@ sub init_all_types {
               FIXED_VALUE => 'c');
     init_type ('case_idx', 'fixed', C_TYPE => 'size_t',
               FIXED_VALUE => 'case_idx');
+    init_type ('dataset', 'fixed', C_TYPE => 'struct dataset *',
+              FIXED_VALUE => 'ds');
 
     # One of these is emitted at the end of each expression as a sentinel
     # that tells expr_evaluate() to return the value on the stack.