X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcommand.h;h=ecd2a752659d663366c3788fe7c9f5d105a36dfe;hb=5d1c47b1ef2d392ce223606139d45eac749d4c80;hp=0c153becd74ddd4b8f06681f7f9d6afe176ee017;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp diff --git a/src/language/command.h b/src/language/command.h index 0c153becd7..ecd2a75265 100644 --- a/src/language/command.h +++ b/src/language/command.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2010, 2013 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 @@ -27,12 +27,6 @@ enum cmd_result CMD_EOF = 2, /* End of input. */ CMD_FINISH = 3, /* FINISH was executed. */ - /* Range of successful return values available for use - by agreement between a command and the caller of - cmd_parse(). */ - CMD_PRIVATE_FIRST = 4, - CMD_PRIVATE_LAST = 127, - /* Various kinds of failures. */ CMD_FAILURE = -1, /* Not executed at all. */ CMD_NOT_IMPLEMENTED = -2, /* Command not implemented. */ @@ -45,10 +39,14 @@ bool cmd_result_is_failure (enum cmd_result); /* Command processing state. */ enum cmd_state { - CMD_STATE_INITIAL, /* No active file yet defined. */ - CMD_STATE_DATA, /* Active file has been defined. */ + CMD_STATE_INITIAL, /* No active dataset yet defined. */ + CMD_STATE_DATA, /* Active dataset has been defined. */ CMD_STATE_INPUT_PROGRAM, /* Inside INPUT PROGRAM. */ - CMD_STATE_FILE_TYPE /* Inside FILE TYPE. */ + CMD_STATE_FILE_TYPE, /* Inside FILE TYPE. */ + + /* Inside LOOP or DO IF... */ + CMD_STATE_NESTED_DATA, /* ...in CMD_STATE_DATA. */ + CMD_STATE_NESTED_INPUT_PROGRAM, /* ...in CMD_STATE_INPUT_PROGRAM. */ }; struct dataset;