X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frepeat.c;h=4a5bf2f9dc1a983c8edd235b547082441a2b6012;hb=d31103641648cfc48746b1765d7c0e52c3dfb714;hp=8b66a7122a936e8d4eacc216f887fcd3d0793ee6;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp-builds.git diff --git a/src/repeat.c b/src/repeat.c index 8b66a712..4a5bf2f9 100644 --- a/src/repeat.c +++ b/src/repeat.c @@ -18,13 +18,14 @@ 02111-1307, USA. */ #include -#include +#include "repeat.h" +#include "error.h" #include #include #include #include "alloc.h" -#include "cases.h" #include "command.h" +#include "dictionary.h" #include "error.h" #include "getline.h" #include "lexer.h" @@ -33,8 +34,6 @@ #include "str.h" #include "var.h" -#undef DEBUGGING -/*#define DEBUGGING 1*/ #include "debug-print.h" /* Describes one DO REPEAT macro. */ @@ -62,11 +61,6 @@ static int parse_strings (struct repeat_entry *); static void clean_up (void); static int internal_cmd_do_repeat (void); -#if DEBUGGING -static void debug_print (void); -static void debug_print_lines (void); -#endif - int cmd_do_repeat (void) { @@ -140,9 +134,6 @@ internal_cmd_do_repeat (void) int print; /* The first step is parsing the DO REPEAT command itself. */ - lex_match_id ("DO"); - lex_match_id ("REPEAT"); - count = 0; line_buf_head = NULL; do @@ -178,7 +169,7 @@ internal_cmd_do_repeat (void) if (token == T_ID) result = parse_ids (e); - else if (token == T_NUM) + else if (lex_is_number ()) result = parse_numbers (e); else if (token == T_STRING) result = parse_strings (e); @@ -213,10 +204,6 @@ internal_cmd_do_repeat (void) } while (token != '.'); -#if DEBUGGING - debug_print (); -#endif - /* Read all the lines inside the DO REPEAT ... END REPEAT. */ { int nest = 1; @@ -250,7 +237,7 @@ internal_cmd_do_repeat (void) command names must appear on a single line--they can't be spread out. */ { - char *cp = ds_value (&getl_buf); + char *cp = ds_c_str (&getl_buf); /* Skip leading indentors and any whitespace. */ if (*cp == '+' || *cp == '-' || *cp == '.') @@ -296,7 +283,7 @@ internal_cmd_do_repeat (void) line_buf_tail->len = ds_length (&getl_buf); line_buf_tail->line = xmalloc (ds_length (&getl_buf) + 1); memcpy (line_buf_tail->line, - ds_value (&getl_buf), ds_length (&getl_buf) + 1); + ds_c_str (&getl_buf), ds_length (&getl_buf) + 1); } } @@ -304,7 +291,7 @@ internal_cmd_do_repeat (void) REPEAT line. We should actually check for the PRINT specifier. This can be done easier when we buffer entire commands instead of doing it token by token; see TODO. */ - lex_entire_line (); + lex_discard_line (); /* Tie up the loose end of the chain. */ if (line_buf_head == NULL) @@ -314,11 +301,6 @@ internal_cmd_do_repeat (void) } line_buf_tail->next = NULL; - /* Show the line list. */ -#if DEBUGGING - debug_print_lines (); -#endif - /* Make new variables. */ { struct repeat_entry *iter; @@ -330,14 +312,7 @@ internal_cmd_do_repeat (void) { /* Note that if the variable already exists there is no harm done. */ - struct variable *v = create_variable (&default_dict, - iter->replacement[i], - NUMERIC, 0); - - /* If we created the variable then we need to initialize - its observations to SYSMIS. */ - if (v) - envector (v); + dict_create_var (default_dict, iter->replacement[i], 0); } } } @@ -515,7 +490,7 @@ cmd_end_repeat (void) /* Finds a DO REPEAT macro with name MACRO_NAME and returns the appropriate subsitution if found, or NULL if not. */ -char * +static char * find_DO_REPEAT_substitution (char *macro_name) { struct getl_script *s; @@ -551,19 +526,19 @@ perform_DO_REPEAT_substitutions (void) /* Terminal dot. */ int dot = 0; - ds_init (NULL, &output, ds_size (&getl_buf)); + ds_init (&output, ds_capacity (&getl_buf)); /* Strip trailing whitespace, check for & remove terminal dot. */ while (ds_length (&getl_buf) > 0 && isspace ((unsigned char) ds_end (&getl_buf)[-1])) ds_truncate (&getl_buf, ds_length (&getl_buf) - 1); - if (ds_length (&getl_buf) > 0 && ds_end (&getl_buf)[-1] == set_endcmd) + if (ds_length (&getl_buf) > 0 && ds_end (&getl_buf)[-1] == get_endcmd() ) { dot = 1; ds_truncate (&getl_buf, ds_length (&getl_buf) - 1); } - for (cp = ds_value (&getl_buf); cp < ds_end (&getl_buf); ) + for (cp = ds_c_str (&getl_buf); cp < ds_end (&getl_buf); ) { if (*cp == '\'' && !in_quote) in_apos ^= 1; @@ -572,7 +547,7 @@ perform_DO_REPEAT_substitutions (void) if (in_quote || in_apos || !CHAR_IS_ID1 (*cp)) { - ds_putchar (&output, *cp++); + ds_putc (&output, *cp++); continue; } @@ -592,59 +567,17 @@ perform_DO_REPEAT_substitutions (void) substitution = find_DO_REPEAT_substitution (name); if (!substitution) { - ds_concat_buffer (&output, start, cp - start); + ds_concat (&output, start, cp - start); continue; } /* Force output buffer size, copy substitution. */ - ds_concat (&output, substitution); + ds_puts (&output, substitution); } } if (dot) - ds_putchar (&output, (unsigned char) set_endcmd); + ds_putc (&output, get_endcmd() ); ds_destroy (&getl_buf); getl_buf = output; } - -/* Debugging code. */ - -#if DEBUGGING -static void -debug_print (void) -{ - struct repeat_entry *iter; - int j; - - printf ("DO REPEAT\n"); - for (iter = repeat_tab; iter; iter = iter->next) - { - printf (" %s%s=", iter->id, iter->type ? "(ids)" : ""); - for (j = 0; j < count; j++) - printf ("%s ", iter->replacement[j]); - putc (iter->next ? '/' : '.', stdout); - printf ("\n"); - } -} - -static void -debug_print_lines (void) -{ - struct getl_line_list *iter; - const char *fn = "(none)"; - int ln = 65536; - - printf ("---begin DO REPEAT lines---\n"); - for (iter = line_buf_head; iter; iter = iter->next) - { - if (iter->len < 0) - { - ln = -iter->len; - fn = iter->line; - } else { - printf ("%s:%d: %s", fn, ln++, iter->line); - } - } - printf ("---end DO REPEAT lines---\n"); -} -#endif /* DEBUGGING */