X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=eeb3827a58924dfa13eedd6bf2d2c2df43ffd8b5;hb=691c25e36fd1ee722dd35419d6110e3876b99f9c;hp=e4ab76a9992739c78a36f6ad2a98c4f6e0b48d83;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index e4ab76a9..eeb3827a 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010 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 @@ -47,12 +47,12 @@ static int parse_get_psql (struct lexer *lexer, struct dataset *); int cmd_get_data (struct lexer *lexer, struct dataset *ds) { - lex_force_match (lexer, '/'); + lex_force_match (lexer, T_SLASH); if (!lex_force_match_id (lexer, "TYPE")) return CMD_FAILURE; - lex_force_match (lexer, '='); + lex_force_match (lexer, T_EQUALS); if (lex_match_id (lexer, "GNM")) return parse_get_gnm (lexer, ds); @@ -75,12 +75,12 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) psql.bsize = -1; ds_init_empty (&psql.sql); - lex_force_match (lexer, '/'); + lex_force_match (lexer, T_SLASH); if (!lex_force_match_id (lexer, "CONNECT")) goto error; - lex_force_match (lexer, '='); + lex_force_match (lexer, T_EQUALS); if (!lex_force_string (lexer)) goto error; @@ -89,17 +89,17 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) lex_get (lexer); - while (lex_match (lexer, '/') ) + while (lex_match (lexer, T_SLASH) ) { if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); psql.str_width = lex_integer (lexer); lex_get (lexer); } else if ( lex_match_id (lexer, "BSIZE")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); psql.bsize = lex_integer (lexer); lex_get (lexer); } @@ -109,7 +109,7 @@ parse_get_psql (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "SQL")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if ( ! lex_force_string (lexer) ) goto error; @@ -143,12 +143,12 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) { struct gnumeric_read_info gri = {NULL, NULL, NULL, 1, true, -1}; - lex_force_match (lexer, '/'); + lex_force_match (lexer, T_SLASH); if (!lex_force_match_id (lexer, "FILE")) goto error; - lex_force_match (lexer, '='); + lex_force_match (lexer, T_EQUALS); if (!lex_force_string (lexer)) goto error; @@ -157,16 +157,16 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) lex_get (lexer); - while (lex_match (lexer, '/') ) + while (lex_match (lexer, T_SLASH) ) { if ( lex_match_id (lexer, "ASSUMEDSTRWIDTH")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); gri.asw = lex_integer (lexer); } else if (lex_match_id (lexer, "SHEET")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NAME")) { if ( ! lex_force_string (lexer) ) @@ -184,7 +184,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "CELLRANGE")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "FULL")) { @@ -203,7 +203,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "READNAMES")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if ( lex_match_id (lexer, "ON")) { @@ -219,7 +219,6 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds) } else { - printf ("Unknown data file type \"\%s\"\n", lex_tokid (lexer)); goto error; } lex_get (lexer); @@ -271,7 +270,7 @@ static int parse_get_txt (struct lexer *lexer, struct dataset *ds) { struct data_parser *parser = NULL; - struct dictionary *dict = NULL; + struct dictionary *dict = dict_create (); struct file_handle *fh = NULL; struct dfm_reader *reader = NULL; @@ -279,16 +278,16 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) enum data_parser_type type; bool has_type; - lex_force_match (lexer, '/'); + lex_force_match (lexer, T_SLASH); if (!lex_force_match_id (lexer, "FILE")) goto error; - lex_force_match (lexer, '='); + lex_force_match (lexer, T_EQUALS); fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE); if (fh == NULL) goto error; - parser = data_parser_create (); + parser = data_parser_create (dict); has_type = false; data_parser_set_type (parser, DP_DELIMITED); data_parser_set_span (parser, false); @@ -297,14 +296,14 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) for (;;) { - if (!lex_force_match (lexer, '/')) + if (!lex_force_match (lexer, T_SLASH)) goto error; if (lex_match_id (lexer, "ARRANGEMENT")) { bool ok; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "FIXED")) ok = set_type (parser, "ARRANGEMENT=FIXED", DP_FIXED, &has_type); else if (lex_match_id (lexer, "DELIMITED")) @@ -312,7 +311,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) DP_DELIMITED, &has_type); else { - lex_error (lexer, _("expecting FIXED or DELIMITED")); + lex_error (lexer, _("expecting %s or %s"), "FIXED", "DELIMITED"); goto error; } if (!ok) @@ -320,7 +319,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "FIRSTCASE")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!lex_force_int (lexer)) goto error; if (lex_integer (lexer) < 1) @@ -335,7 +334,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) { if (!set_type (parser, "DELCASE", DP_DELIMITED, &has_type)) goto error; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "LINE")) data_parser_set_span (parser, false); else if (lex_match_id (lexer, "VARIABLES")) @@ -350,7 +349,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } else { - lex_error (lexer, _("expecting LINE or VARIABLES")); + lex_error (lexer, _("expecting %s or %s"), "LINE", "VARIABLES"); goto error; } } @@ -358,7 +357,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) { if (!set_type (parser, "FIXCASE", DP_FIXED, &has_type)) goto error; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!lex_force_int (lexer)) goto error; if (lex_integer (lexer) < 1) @@ -371,7 +370,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "IMPORTCASES")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match (lexer, T_ALL)) { data_parser_set_case_limit (parser, -1); @@ -411,7 +410,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) if (!set_type (parser, "DELIMITERS", DP_DELIMITED, &has_type)) goto error; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!lex_force_string (lexer)) goto error; @@ -421,11 +420,11 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) ds_put_cstr (&hard_seps, "\t"); if (ss_match_string (&s, ss_cstr ("\\\\"))) ds_put_cstr (&hard_seps, "\\"); - while ((c = ss_get_char (&s)) != EOF) + while ((c = ss_get_byte (&s)) != EOF) if (c == ' ') soft_seps = " "; else - ds_put_char (&hard_seps, c); + ds_put_byte (&hard_seps, c); data_parser_set_soft_delimiters (parser, ss_cstr (soft_seps)); data_parser_set_hard_delimiters (parser, ds_ss (&hard_seps)); ds_destroy (&hard_seps); @@ -436,7 +435,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) { if (!set_type (parser, "QUALIFIERS", DP_DELIMITED, &has_type)) goto error; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!lex_force_string (lexer)) goto error; @@ -459,13 +458,13 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) break; else { - lex_error (lexer, _("expecting VARIABLES")); + lex_error (lexer, _("expecting %s"), "VARIABLES"); goto error; } } - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); + - dict = dict_create (); record = 1; type = data_parser_get_type (parser); do @@ -475,7 +474,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) int fc, lc; struct variable *v; - while (type == DP_FIXED && lex_match (lexer, '/')) + while (type == DP_FIXED && lex_match (lexer, T_SLASH)) { if (!lex_force_int (lexer)) goto error; @@ -540,7 +539,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds) data_parser_add_fixed_field (parser, &input, var_get_case_index (v), name, record, fc); } - while (lex_token (lexer) != '.'); + while (lex_token (lexer) != T_ENDCMD); reader = dfm_open_reader (fh, lexer); if (reader == NULL)