X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcommand.def;h=f1acb02c9d13d4034488a57805c83d72021c0c0c;hb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;hp=ccbb462172cf7c2aa45cedaed40198268d79fc98;hpb=ecef385b0191afa4c27927146ac1f6c5a1852119;p=pspp diff --git a/src/language/command.def b/src/language/command.def index ccbb462172..f1acb02c9d 100644 --- a/src/language/command.def +++ b/src/language/command.def @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,13 +16,21 @@ /* Utility commands acceptable anywhere. */ DEF_CMD (S_ANY, F_ENHANCED, "CLOSE FILE HANDLE", cmd_close_file_handle) -DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "COMMENT", cmd_comment) +DEF_CMD (S_ANY, 0, "CACHE", cmd_cache) DEF_CMD (S_ANY, 0, "CD", cmd_cd) +DEF_CMD (S_ANY, 0, "DATASET ACTIVATE", cmd_dataset_activate) +DEF_CMD (S_ANY, 0, "DATASET DECLARE", cmd_dataset_declare) +DEF_CMD (S_ANY, 0, "DATASET CLOSE", cmd_dataset_close) +DEF_CMD (S_ANY, 0, "DATASET COPY", cmd_dataset_copy) +DEF_CMD (S_ANY, 0, "DATASET NAME", cmd_dataset_name) +DEF_CMD (S_ANY, 0, "DATASET DISPLAY", cmd_dataset_display) +DEF_CMD (S_ANY, 0, "DO REPEAT", cmd_do_repeat) +DEF_CMD (S_ANY, 0, "END REPEAT", cmd_end_repeat) DEF_CMD (S_ANY, 0, "ECHO", cmd_echo) DEF_CMD (S_ANY, 0, "ERASE", cmd_erase) DEF_CMD (S_ANY, 0, "EXIT", cmd_finish) DEF_CMD (S_ANY, 0, "FILE HANDLE", cmd_file_handle) -DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "FILE LABEL", cmd_file_label) +DEF_CMD (S_ANY, 0, "FILE LABEL", cmd_file_label) DEF_CMD (S_ANY, 0, "FINISH", cmd_finish) DEF_CMD (S_ANY, 0, "HOST", cmd_host) DEF_CMD (S_ANY, 0, "INCLUDE", cmd_include) @@ -37,11 +45,11 @@ DEF_CMD (S_ANY, 0, "QUIT", cmd_finish) DEF_CMD (S_ANY, 0, "RESTORE", cmd_restore) DEF_CMD (S_ANY, 0, "SET", cmd_set) DEF_CMD (S_ANY, 0, "SHOW", cmd_show) -DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "SUBTITLE", cmd_subtitle) +DEF_CMD (S_ANY, 0, "SUBTITLE", cmd_subtitle) DEF_CMD (S_ANY, 0, "SYSFILE INFO", cmd_sysfile_info) -DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "TITLE", cmd_title) +DEF_CMD (S_ANY, 0, "TITLE", cmd_title) -/* Commands that define (or replace) the active file. */ +/* Commands that define (or replace) the active dataset. */ DEF_CMD (S_INITIAL | S_DATA, 0, "ADD FILES", cmd_add_files) DEF_CMD (S_INITIAL | S_DATA | S_INPUT_PROGRAM | S_FILE_TYPE, 0, "DATA LIST", cmd_data_list) DEF_CMD (S_INITIAL | S_DATA, 0, "GET", cmd_get) @@ -60,10 +68,8 @@ DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "BREAK", cmd_break) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "COMPUTE", cmd_compute) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DATAFILE ATTRIBUTE", cmd_datafile_attribute) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DISPLAY", cmd_display) -DEF_CMD (S_DATA | S_INPUT_PROGRAM, F_KEEP_FINAL_TOKEN, "DOCUMENT", cmd_document) +DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DOCUMENT", cmd_document) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DO IF", cmd_do_if) -DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DO REPEAT", cmd_do_repeat) -DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "END REPEAT", cmd_end_repeat) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DROP DOCUMENTS", cmd_drop_documents) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "ELSE IF", cmd_else_if) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "ELSE", cmd_else) @@ -97,10 +103,10 @@ DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "WRITE", cmd_write) DEF_CMD (S_DATA | S_INPUT_PROGRAM, F_ENHANCED, "XEXPORT", cmd_xexport) DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "XSAVE", cmd_xsave) -/* Commands that may appear after active file definition. */ +/* Commands that may appear after active dataset definition. */ DEF_CMD (S_DATA, 0, "AGGREGATE", cmd_aggregate) DEF_CMD (S_DATA, 0, "AUTORECODE", cmd_autorecode) -DEF_CMD (S_DATA, F_KEEP_FINAL_TOKEN, "BEGIN DATA", cmd_begin_data) +DEF_CMD (S_DATA, 0, "BEGIN DATA", cmd_begin_data) DEF_CMD (S_DATA, 0, "COUNT", cmd_count) DEF_CMD (S_DATA, 0, "CROSSTABS", cmd_crosstabs) DEF_CMD (S_DATA, 0, "CORRELATIONS", cmd_correlation) @@ -113,11 +119,13 @@ DEF_CMD (S_DATA, 0, "FACTOR", cmd_factor) DEF_CMD (S_DATA, 0, "FILTER", cmd_filter) DEF_CMD (S_DATA, 0, "FLIP", cmd_flip) DEF_CMD (S_DATA, 0, "FREQUENCIES", cmd_frequencies) +DEF_CMD (S_DATA, 0, "GLM", cmd_glm) DEF_CMD (S_DATA, 0, "LIST", cmd_list) DEF_CMD (S_DATA, 0, "MODIFY VARS", cmd_modify_vars) DEF_CMD (S_DATA, 0, "NPAR TESTS", cmd_npar_tests) DEF_CMD (S_DATA, 0, "ONEWAY", cmd_oneway) DEF_CMD (S_DATA, 0, "PEARSON CORRELATIONS", cmd_correlation) +DEF_CMD (S_DATA, 0, "QUICK CLUSTER", cmd_quick_cluster) DEF_CMD (S_DATA, 0, "RANK", cmd_rank) DEF_CMD (S_DATA, 0, "REGRESSION", cmd_regression) DEF_CMD (S_DATA, 0, "RELIABILITY", cmd_reliability) @@ -127,7 +135,6 @@ DEF_CMD (S_DATA, 0, "SAMPLE", cmd_sample) DEF_CMD (S_DATA, 0, "SAVE", cmd_save) DEF_CMD (S_DATA, 0, "SAVE TRANSLATE", cmd_save_translate) DEF_CMD (S_DATA, 0, "SORT CASES", cmd_sort_cases) -DEF_CMD (S_DATA, F_ABBREV, "SORT", cmd_sort_cases) DEF_CMD (S_DATA, 0, "T-TEST", cmd_t_test) DEF_CMD (S_DATA, 0, "TEMPORARY", cmd_temporary) DEF_CMD (S_DATA, 0, "USE", cmd_use) @@ -158,7 +165,7 @@ UNIMPL_CMD ("CASESTOVARS", "Restructure complex data") UNIMPL_CMD ("CATPCA", "Categorical principle components analysis") UNIMPL_CMD ("CATREG", "Categorical regression") UNIMPL_CMD ("CCF", "Time series cross correlation") -UNIMPL_CMD ("CLEAR TRANSFORMATIONS", "Clears transformations from active file") +UNIMPL_CMD ("CLEAR TRANSFORMATIONS", "Clears transformations from active dataset") UNIMPL_CMD ("CLUSTER", "Hierachial clustering") UNIMPL_CMD ("CONJOINT", "Analyse full concept data") UNIMPL_CMD ("CORRESPONDENCE", "Show correspondence") @@ -172,7 +179,6 @@ UNIMPL_CMD ("CSSELECT", "Select complex samples") UNIMPL_CMD ("CSTABULATE", "Tabulate complex samples") UNIMPL_CMD ("CTABLES", "Display complex samples") UNIMPL_CMD ("CURVEFIT", "Fit curve to line plot") -UNIMPL_CMD ("DATASET", "Alternate data set") UNIMPL_CMD ("DATE", "Create time series data") UNIMPL_CMD ("DEFINE", "Syntax macros") UNIMPL_CMD ("DETECTANOMALY", "Find unusual cases") @@ -184,7 +190,6 @@ UNIMPL_CMD ("FIT", "Goodness of Fit") UNIMPL_CMD ("GENLOG", "Categorical model fitting") UNIMPL_CMD ("GET TRANSLATE", "Read other file formats") UNIMPL_CMD ("GGRAPH", "Custom defined graphs") -UNIMPL_CMD ("GLM", "General Linear Model") UNIMPL_CMD ("GRAPH", "Draw graphs") UNIMPL_CMD ("HILOGLINEAR", "Hierarchial loglinear models") UNIMPL_CMD ("HOMALS", "Homogeneity analysis") @@ -230,7 +235,6 @@ UNIMPL_CMD ("PROBIT", "Probit analysis") UNIMPL_CMD ("PROCEDURE OUTPUT", "Specify output file") UNIMPL_CMD ("PROXIMITIES", "Pairwise similarity") UNIMPL_CMD ("PROXSCAL", "Multidimensional scaling of proximity data") -UNIMPL_CMD ("QUICK CLUSTER", "Fast clustering") UNIMPL_CMD ("RATIO STATISTICS", "Descriptives of ratios") UNIMPL_CMD ("READ MODEL", "Read new model") UNIMPL_CMD ("RECORD TYPE", "Defines a type of record within FILE TYPE")