Changeset 176

Timestamp:

05/18/07 23:08:24 (1 year ago)

Author:

ant_39

Message:

• Support preprocessing. Test case included.
  

Files:

• trunk/gcc/gcc/algol60/lang-specs.h (modified) (1 diff)
• trunk/gcc/gcc/algol60/lang.c (modified) (4 diffs)
• trunk/gcc/gcc/algol60/lang.opt (modified) (1 diff)
• trunk/gcc/gcc/algol60/lexer.h (modified) (2 diffs)
• trunk/gcc/gcc/algol60/lexer.l (modified) (9 diffs)
• trunk/gcc/gcc/algol60/parser.y (modified) (1 diff)
• trunk/gcc/gcc/testsuite/algol60.dg/compile/preproc.ALG (added)
• trunk/gcc/gcc/testsuite/algol60.dg/dg.exp (modified) (1 diff)

trunk/gcc/gcc/algol60/lang-specs.h

@@ -2 +2 @@
-   for the Algol 60 language.  */
-
+{".A60",   "@a60-cpp-input", 0, 0, 0},
+{".ALG",   "@a60-cpp-input", 0, 0, 0},
+{"@a60-cpp-input",
+  "cc1 -E -traditional-cpp -D_ALGOL60_ %(cpp_options) \
+      %{E|M|MM:%(cpp_debug_options)}\
+      %{!M:%{!MM:%{!E: -o %|.a60 |\n\
+    algol601 -fpreprocessed %|.a60 %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+
-{".a60",   "@a60", 0, 0, 0},
-A60
-
-
+alg
+%{!MM:%{!M:
+}}

trunk/gcc/gcc/algol60/lang.c

@@ -90 +90 @@
-  int parser_trace;
-  int lexer_trace;
+  int preprocessed;
-}
-a60_options_t;
@@ -128 +129 @@
-  a60_options->parser_trace = 0;
-  a60_options->lexer_trace = 0;
+  a60_options->preprocessed = 0;
-  return CL_Algol60;
-}
@@ -148 +150 @@
-      a60_options->lexer_trace = value;
-      return 1;
+    case OPT_fpreprocessed:
+      a60_options->preprocessed = value;
+      return 1;
-    };
-  fprintf (stderr, "scode %ul option %s value %d\n", scode, arg, value);
@@ -185 +190 @@
-  lexer_t * a_lexer = new_lexer (a60_options->ifile, a60_options->ifname, true);
-  gcc_assert (a_lexer != NULL);
+  lexer_set_preprocessed (a_lexer, a60_options->preprocessed);
-  if (a60_options->lexer_trace)
-    lexer_set_logging (a_lexer, ll_debug, false);

trunk/gcc/gcc/algol60/lang.opt

@@ -18 +18 @@
-Dump AST immediately after the parse
-
+fpreprocessed
+Algol60
+Treat the input file as preprocessed
+
-; This comment is to ensure we retain the blank line above.

trunk/gcc/gcc/algol60/lexer.h

@@ -63 +63 @@
-  ATTRIBUTE_NONNULL(1);
-
+/// Query the name of parsed stream, taking into account preprocessing
+/// directives.
+char const * lexer_pp_filename (lexer_t const * lexer)
+  ATTRIBUTE_NONNULL(1);
+
-
-/// Fetch new token with given lexer, assign a location of given token,
@@ -94 +99 @@
-  ATTRIBUTE_NONNULL(1);
-
+/// Whether lexer should recognize preprocessing output (linemarks) in
+/// input file.
+void lexer_set_preprocessed (lexer_t * lexer, int preprocessed)
+  ATTRIBUTE_NONNULL(1);
+
-#endif//_AL60L_LEXER_H_

trunk/gcc/gcc/algol60/lexer.l

@@ -18 +18 @@
-#include <math.h>
-#include <limits.h>
+#include <ctype.h>
-
-static char const* private_lexer_signature = "lexer";
@@ -33 +34 @@
-  token_kind_t current_tok;
-  token_kind_t prev_tok;
+  int preprocessed;
+  char * pp_filename;
+  int pp_lineno;
+  int pp_baselineno;
-} lexer_rep_t;
-
@@ -48 +53 @@
-%x COMMENT
-%x END_COMMENT
+%x PREPROCESSOR
-
-%option noyywrap
@@ -365 +371 @@
-
-
+ /* Preprocessor linemarker. */
+^"#" {
+  lexer_rep_t * lexer = yyget_extra (yyscanner);
+  if (lexer->preprocessed)
+    BEGIN PREPROCESSOR;
+  else
+    private_lexer_invalid_character (lexer, yylineno, *yyget_text (yyscanner));
+}
+
+<PREPROCESSOR>[ \t]*{DIGIT}*[ \t]*"\""[^\"]*"\""[ \t]*.*$ {
+  lexer_rep_t * lexer = yyget_extra (yyscanner);
+  char * linemarker = yyget_text (yyscanner);
+
+  // It's strange to parse tokens inside lexical analyzer by hand, but
+  // it's the easies approach...  At least we know that the string
+  // matches the rule regexp, and don't have to be paranoid.
+
+  while (isspace (*linemarker))
+    ++linemarker;
+
+  // line number...
+  char * linenumber = linemarker;
+  while (*linemarker && isdigit (*linemarker))
+    ++linemarker;
+  *linemarker++ = 0;
+
+  while (*linemarker && isspace (*linemarker))
+    ++linemarker;
+
+  // file name... remember to skip "\""
+  ++linemarker;
+  char * filename = linemarker;
+  while (*linemarker != '\"')
+    ++linemarker;
+  *linemarker = 0;
+
+  free (lexer->pp_filename);
+  lexer->pp_filename = strdup (filename);
+  lexer->pp_lineno = atoi (linenumber);
+  lexer->pp_baselineno = yylineno + 1; // linemarker refers line ahead
+
+  BEGIN INITIAL;
+}
+
+<PREPROCESSOR>.*$ {
+  lexer_rep_t * lexer = yyget_extra (yyscanner);
+  cursor_t * csr = new_cursor (lexer->filename, yylineno);
+  log_printfc (lexer->log, ll_error, csr,
+               "unrecognized preprocessing directive");
+  delete_cursor (csr);
+  BEGIN INITIAL;
+}
+
+
- /* identifier */
-{LETTER}({LETTER}|{DIGIT})* {
@@ -449 +509 @@
-  return private_lexer_got_eof_token (yyscanner, yylineno, NULL);
-}
+
-
-
@@ -498 +559 @@
-      ret->prev_tok = -1;
-      ret->managed = manage;
+      ret->preprocessed = 0;
+
+      ret->pp_filename = NULL;
+      ret->pp_lineno = 0;
+      ret->pp_baselineno = 0;
-      return (void*)ret;
-    }
@@ -555 +621 @@
-}
-
+char const *
+lexer_pp_filename (lexer_t const * _lexer)
+{
+  assert (_lexer != NULL);
+  lexer_rep_t * lexer = (void*)_lexer;
+  if (lexer->pp_filename)
+    return lexer->pp_filename;
+  else
+    return lexer->filename;
+}
+
-/// Procedure to write out that bad character has been hit.
-/// Bad characters are considered errors.
@@ -630 +707 @@
-  // reentrant scanner anyway.
-  struct yyguts_t * yyg = (void*)lexer->flex_scanner;
-
+
+
+
+
-  loc->first_column = loc->last_column = 0;
-
@@ -679 +759 @@
-  return (logger_t const*)lexer->log;
-}
+
+void
+lexer_set_preprocessed (lexer_t * _lexer, int preprocessed)
+{
+  assert (_lexer != NULL);
+  lexer_rep_t * lexer = (void*)_lexer;
+  lexer->preprocessed = preprocessed;
+}

trunk/gcc/gcc/algol60/parser.y

@@ -51 +51 @@
-cr_csr (parser_rep_t * parser, YYLTYPE * loc)
-{
-
+pp_
-}
-

trunk/gcc/gcc/testsuite/algol60.dg/dg.exp

@@ -31 +31 @@
-# Main loop.
-algol60-dg-runtest [lsort \
-60
+\[6lL\]\[0gG\]
-
-algol60-dg-runtest [lsort \
-60
+\[6lL\]\[0gG\]
-
-# All done.