Changeset 159

Timestamp:

04/11/07 04:17:09 (2 years ago)

Author:

ant_39

Message:

• Quite large update: laying foundation for functions.
  
• Symbol table was refactored to the object of its own (source:trunk/gcc/gcc/algol60/a60_symtab.c, source:trunk/gcc/gcc/algol60/a60_symtab.h, source:trunk/gcc/gcc/algol60/a60_symtab.i). Symbols are now not handled via calls to statements/containers. Adjustments across the source were necessary.
  
• Symbols are of two kinds now: variables and functions. Types are resolved via symbol_resolve_symbols. Functions will be also resolved here.
  
• Parser supports function syntax (but only syntax).
  
• Symbol table doesn't allow explicit iteration. Instead there is a dispatch function a60_symtab_each that calls back given function for each symbol in table. This is used in source:trunk/gcc/gcc/algol60/al60l-bind.c.
  

Files:

• trunk/gcc/gcc/algol60/Make-lang.in (modified) (3 diffs)
• trunk/gcc/gcc/algol60/a60_symtab.c (added)
• trunk/gcc/gcc/algol60/a60_symtab.h (added)
• trunk/gcc/gcc/algol60/a60_symtab.i (added)
• trunk/gcc/gcc/algol60/al60l-bind.c (modified) (5 diffs)
• trunk/gcc/gcc/algol60/desig-expr.c (modified) (3 diffs)
• trunk/gcc/gcc/algol60/expression.c (modified) (3 diffs)
• trunk/gcc/gcc/algol60/parser.y (modified) (10 diffs)
• trunk/gcc/gcc/algol60/statement.c (modified) (11 diffs)
• trunk/gcc/gcc/algol60/statement.h (modified) (3 diffs)
• trunk/gcc/gcc/algol60/symbol.c (modified) (7 diffs)
• trunk/gcc/gcc/algol60/symbol.h (modified) (2 diffs)
• trunk/gcc/gcc/algol60/type.c (modified) (5 diffs)
• trunk/gcc/gcc/algol60/type.h (modified) (4 diffs)

trunk/gcc/gcc/algol60/Make-lang.in

@@ -32 +32 @@
-                algol60/symbol.o algol60/type.o \
-                algol60/for-elmt.o algol60/desig-expr.o \
-
+
+
-
-.PHONY: algol60
@@ -144 +145 @@
-algol60/symbol.o: algol60/symbol.c algol60/symbol.h algol60/symbol.i\
-                algol60/label.i algol60/type.i algol60/statement.i algol60/estring.i\
-
+ algol60/logger.i
-                algol60/label.h algol60/type.h algol60/statement.h algol60/estring.h\
-
+ algol60/logger.h
-                algol60/visitor.i algol60/visitor.h algol60/visitor-impl.h\
+                algol60/meta.h algol60/pd.h algol60/gcc-stuff
+
+algol60/a60_symtab.o: algol60/a60_symtab.c algol60/a60_symtab.h algol60/a60_symtab.i\
+                algol60/symbol.i algol60/label.i algol60/type.i algol60/statement.i\
+                algol60/estring.i algol60/logger.i algol60/cursor.i algol60/visitor.i\
+                algol60/slist.h algol60/symbol.h algol60/label.h algol60/type.h\
+                algol60/logger.h algol60/estring.h\
-                algol60/meta.h algol60/pd.h algol60/gcc-stuff
-
@@ -163 +171 @@
-                algol60/cursor.i algol60/slist.i algol60/expression.i\
-                algol60/logger.i algol60/symbol.i algol60/label.i algol60/type.i\
-
+ algol60/a60_symtab.i
-                algol60/cursor.h algol60/slist.h algol60/expression.h\
-                algol60/logger.h algol60/symbol.h algol60/label.h algol60/type.h\
-                algol60/estring.h algol60/boundspair.h algol60/for-elmt.h\
+                algol60/a60_symtab.h\
-                algol60/visitor-impl.h algol60/visitor.h algol60/visitor.i\
-                algol60/meta.h algol60/pd.h algol60/gcc-stuff

trunk/gcc/gcc/algol60/al60l-bind.c

@@ -40 +40 @@
-#include "for-elmt.h"
-#include "visitor.h"
+#include "a60_symtab.h"
-
-struct struct_al60l_bind_state_t
@@ -730 +731 @@
-}
-
+static void *
+private_stmt_container_build_decl_for_symbol (symbol_t * sym, void * _state)
+{
+  // This is called from stmt_container_build_generic for each symbol
+  // in symbol table.
+  al60l_bind_state_t * state = _state;
+  tree decl = symbol_decl_for_type (sym, symbol_type (sym), state);
+  symbol_set_extra (sym, decl);
+  bind_state_add_decl (state, decl);
+  return NULL;
+}
+
+static void *
+private_stmt_container_build_init_for_symbol (symbol_t * sym, void * _state)
+{
+  // This is called from stmt_container_build_generic for each symbol
+  // in symbol table.
+  al60l_bind_state_t * state = _state;
+  tree init = symbol_init_for_type (sym, symbol_type (sym), state);
+  bind_state_add_stmt (state, init);
+  return NULL;
+}
+
-void *
-stmt_container_build_generic (container_t * self, void * _state)
@@ -740 +764 @@
-  bind_state_push_block (state);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  for (; slist_it_has (it); slist_it_next (it))
-    {
@@ -782 +794 @@
-}
-
+static void *
+private_stmt_toplev_build_decl_for_symbol (symbol_t * sym, void * _state)
+{
+  // This is called from stmt_toplev_build_generic for each symbol
+  // in symbol table.
+  al60l_bind_state_t * state = _state;
+  symbol_set_extra (sym, builtin_decl_get_generic (sym, state));
+  return NULL;
+}
+
-void *
-stmt_toplev_build_generic (container_t * self, void * _state)
-{
-  al60l_bind_state_t * state = _state;
-
-  // Process builtins first.
-
-
-
-
-
-
-
+
+
+
-
-  // The toplev block should contain only one node: the actual program
@@ -961 +977 @@
-  // typechecking, and subexpression resolving has already been done
-  // by this point.
-
+_var
-  symbol_set_type (sym, types[typeidx]); // function type
-  symbol_set_hidden (sym, 1);

trunk/gcc/gcc/algol60/desig-expr.c

@@ -228 +228 @@
-  assert (self != NULL);
-  assert (log != NULL);
+  a60_symtab_t * symtab = container_symtab (context);
-
-  switch (self->base.kind)
@@ -234 +235 @@
-      {
-        self->elbl.sym
-container_find_name_rec_add_undefined (context
+a60_symtab_find_name_rec_add_undefined (symtab
-                                                   type_label (),
-                                                   log, self->cursor);
@@ -266 +267 @@
-      {
-        self->eswitch.sym
-container_find_name_rec_add_undefined (context
+a60_symtab_find_name_rec_add_undefined (symtab
-                                                   type_switch_any (),
-                                                   log, self->cursor);

trunk/gcc/gcc/algol60/expression.c

@@ -617 +617 @@
-{
-  type_t * match_type = new_t_proc (type_any (), new_slist ());
-
+
+
-  if (found == NULL)
-
+
+
-                                                   log, self->cursor);
-  self->idref.sym = found;
@@ -727 +729 @@
-
-  type_t * match_type = new_t_proc (type_any (), argtypes);
+  a60_symtab_t * symtab = container_symtab (block);
-  self->call.sym =
-container_find_name_rec_add_undefined (block
+a60_symtab_find_name_rec_add_undefined (symtab
-                                           match_type, log,
-                                           self->cursor);
@@ -746 +749 @@
-  delete_slist_it (it);
-
+  a60_symtab_t * symtab = container_symtab (block);
-  self->subscript.sym =
-container_find_name_rec_add_undefined (block
+a60_symtab_find_name_rec_add_undefined (symtab
-                                           type_array_any (), log,
-                                           self->cursor);

trunk/gcc/gcc/algol60/parser.y

@@ -14 +14 @@
-#include "desig-expr.h"
-#include "for-elmt.h"
+#include "a60_symtab.h"//!
-#include "meta.h"
-#include "visitor-impl.h"
@@ -196 +197 @@
-//%type <sym> DeclaredIdentifier
-%type <stmt> Block
+%type <type> Specifier
+%type <lst> SpecificationPart
+%type <lst> ValuePart
+%type <lst> FormalParameterList
+%type <lst> FormalParameterPart
-//%type <> BlockDeclarationsList
-//%type <> BlockDeclarations
-%type <type> Type
+%type <type> OptType
-%type <flag> OptOwn
-%type <type> OptIntrinsicType
@@ -228 +235 @@
-%type <lst> ForList
-%type <lelm> ForListElmt
-
-%%
-
@@ -241 +247 @@
-    container_t * c = new_stmt_toplev (NULL);
-    container_set_parent (c, dummy);
-
+
+
-    private_open_block (parser, c);
-  }
@@ -278 +285 @@
-
-LabelIdentifier:
-
-
-
-
-
-
-
+
-  |
-  LITINTEGER
@@ -404 +405 @@
-      private_setup_and_add_symbol (parser, $2, t);
-    }
+  |
+  OptType KWPROCEDURE Identifier FormalParameterPart SEPSEMICOLON ValuePart SpecificationPart Statement
+    {
+      log_printf (parser->log, ll_debug,
+                  "BlockDeclarations -> OptType KWPROCEDURE Identifier "
+                  "FormalParameterPart SEPSEMICOLON ValuePart "
+                  "SpecificationPart Statement");
+      /*
+      slist_t * formal_params = $4;
+      slist_t * value_params = $6;
+      slist_t * param_types = $7;
+      slist_it_t * it = slist_iter (formal_params);
+      for (; slist_it_has (it); slist_it_next (it))
+        {
+          //@TODO
+        }
+      delete_slist_it (it);
+      //type_t * t = new_t_switch ($4);
+      */
+    }
+
+FormalParameterPart:
+  /*epsilon*/ { $$ = new_slist (); }
+  |
+  SEPLPAREN FormalParameterList SEPRPAREN { $$ = $2; }
+
+FormalParameterList:
+  Identifier
+    {
+      $$ = new_slist ();
+      slist_pushfront ($$, $1);
+      @$ = @1;
+    }
+  |
+  FormalParameterList ParameterDelimiter Identifier
+    {
+      slist_pushfront ($$, $3);
+      @$ = @1;
+    }
+
+ValuePart:
+  /*epsilon*/ { $$ = new_slist (); }
+  |
+  KWVALUE IdentifierList SEPSEMICOLON { $$ = $2; }
+
+SpecificationPart:
+  /*epsilon*/
+    { $$ = new_slist (); }
+  |
+  SpecificationPart Specifier IdentifierList SEPSEMICOLON
+    {
+      slist_pushfront ($$, $3);
+      slist_pushfront ($$, $2);
+      @$ = @1;
+    }
+
+Specifier:
+  IntrinsicType
+  |
+  IntrinsicType KWARRAY { $$ = new_t_array ($1); }
+  |
+  KWARRAY { $$ = type_array_real (); }
+  |
+  KWLABEL
+    {
+      log_printf (parser->log, ll_debug, "Specifier -> KWLABEL");
+      $$ = type_label ();
+      @$ = @1;
+    }
+  |
+  KWSWITCH
+    {
+      log_printf (parser->log, ll_debug, "Specifier -> KWSWITCH");
+      $$ = type_switch_any ();
+      @$ = @1;
+    }
+  |
+  OptIntrinsicType KWPROCEDURE
+    {
+      log_printf (parser->log, ll_debug, "Specifier -> OptType KWPROCEDURE");
+      $$ = new_t_proc_stub ($1 ? $1 : type_any ());
+      @$ = @1;
+    }
-
-Type:
@@ -438 +522 @@
-    }
-
+OptType:
+  /*epsilon*/ { $$ = 0; }
+  |
+  Type
+
-OptOwn:
-  /*epsilon*/ { $$ = 0; }
@@ -1178 +1267 @@
-
-  while (context != parser->program_block
-slist
+a60_symtab
-    context = container_parent (context);
-
@@ -1185 +1274 @@
-    {
-      label_t * lbl = slist_it_get (it);
-
-
+
+
+
-        {
-          cursor_t * csr = stmt_cursor (target);
@@ -1207 +1297 @@
-{
-  // Setup symbol and add to table.
-
+_var
-  symbol_set_type (sym, qt);
-
+
+
-  if (conflict)
-    {

trunk/gcc/gcc/algol60/statement.c

@@ -16 +16 @@
-#include "for-elmt.h"
-#include "meta.h"
+#include "a60_symtab.h"
-#include "visitor-impl.h"
-
@@ -64 +65 @@
-{
-  slist_t * statements;
-slist
+a60_symtab
-}
-container_rep_t;
@@ -77 +78 @@
-  sk_goto,
-  sk_block,
-
+,
-}
-stmt_kind_t;
@@ -205 +206 @@
-  statement_t * ret = private_new_statement (kind, cursor, NULL);
-  ret->block.statements = new_slist_typed (adapt_test, a60_as_statement);
-new_slist_typed (adapt_test, a60_as_symbol
+a60_new_symtab (
-  return (container_t *)ret;
-}
@@ -219 +220 @@
-{
-  return private_new_container (sk_toplev, cursor);
-}
-
-statement_t *
-clone_statement (statement_t const * self)
-{
-  assert (self != NULL);
-
-  statement_t * ret = private_new_statement (self->base.kind, self->cursor, NULL);
-
-  switch (self->base.kind)
-    {
-    case sk_dummy:
-      break;
-
-    case sk_assign:
-      ret->assign.lhss = clone_slist (self->assign.lhss);
-      slist_map (ret->assign.lhss, adapt_test, clone_expression);
-      ret->assign.rhs = clone_expression (self->assign.rhs);
-      break;
-
-    case sk_call:
-      ret->call.call = clone_expression (self->call.call);
-      break;
-
-    case sk_cond:
-      ret->cond.cond = clone_expression (self->cond.cond);
-      ret->cond.ifclause = clone_statement (self->cond.ifclause);
-      ret->cond.elseclause
-        = ret->cond.elseclause ? clone_statement (self->cond.elseclause) : NULL;
-      break;
-
-    case sk_for:
-      ret->afor.variable = clone_expression (self->afor.variable);
-      ret->afor.elmts = clone_slist (self->afor.elmts);
-      slist_map (ret->afor.elmts, adapt_test, clone_for_elmt);
-      ret->afor.body = clone_statement (self->afor.body);
-      break;
-
-    case sk_goto:
-      ret->agoto.target = clone_desig_expr (self->agoto.target);
-      break;
-
-    case sk_block:
-    case sk_toplev:
-      {
-        ret->block.symtab = clone_slist (self->block.symtab);
-        slist_map (ret->block.symtab, adapt_test, clone_symbol);
-        ret->block.statements = new_slist_typed (adapt_test, a60_as_statement);
-
-        // extract labels from the list
-        slist_t * labels = new_slist ();
-        slist_it_t * jt = slist_iter (ret->block.symtab);
-        for (; slist_it_has (jt); slist_it_next (jt))
-          {
-            symbol_t * sym = slist_it_get (jt);
-            if (types_same (symbol_type (sym), type_label ()))
-              slist_pushback (labels, sym);
-          }
-
-        // clone statement list and retarget labels in one pass
-        slist_it_t * it = slist_iter (self->block.statements);
-        for (; slist_it_has (it); slist_it_next (it))
-          {
-            statement_t * stmt = slist_it_get (it);
-            statement_t * clone = clone_statement (stmt);
-            container_add_stmt (a60_as_container (ret), clone);
-
-            slist_it_reset (jt, labels);
-            for (; slist_it_has (jt); slist_it_next (jt))
-              {
-                symbol_t * sym = slist_it_get (jt);
-                statement_t * target = symbol_stmt (sym);
-                if (target == stmt)
-                  {
-                    symbol_set_stmt (sym, clone);
-                    stmt_add_label (clone, sym);
-                  }
-              }
-          }
-
-        delete_slist_it (jt);
-        delete_slist_it (it);
-        delete_slist (labels);
-      }
-      break;
-    };
-
-  return ret;
-}
-
-container_t *
-clone_container (container_t const * self)
-{
-  return a60_as_container (clone_statement (a60_as_statement ((container_t *)self)));
-}
-
@@ -353 +260 @@
-
-static void
-
-
+
+
+
+
+
-  estring_t * buf0 = new_estring ();
-
@@ -428 +338 @@
-
-  delete_estring (buf0);
+  */
-}
-
@@ -605 +516 @@
-{
-  assert (a60_as_container (self));
-
-
-
-
-
-
-
-
-
-
-
+
+
-  for (; slist_it_has (it); slist_it_next (it))
-    stmt_resolve_symbols (slist_it_get (it), log);
@@ -729 +631 @@
-
-  self->parent = parent;
+  a60_symtab_set_parent (self->block.symtab, ((statement_t*)parent)->block.symtab);
-}
-
@@ -838 +741 @@
-}
-
-slist
+a60_symtab
-container_symtab (container_t const * _self)
-{
@@ -854 +757 @@
-  assert (self->base.kind == sk_block || self->base.kind == sk_toplev);
-  return self->block.statements;
-}
-
-static void
-private_container_find_it (statement_t * container, label_t const * lbl, type_t const * atype, slist_it_t ** ret_prev, slist_it_t ** ret_it)
-{
-  slist_it_t * it = slist_iter (container->block.symtab);
-  slist_it_t * prev = NULL;
-
-  for (; slist_it_has (it); )
-    {
-      symbol_t * sym = slist_it_get (it);
-      type_t * symtype = symbol_type (sym);
-      if (label_eq (symbol_label (sym), lbl)
-          && (symtype == NULL || types_match (symtype, atype)))
-        break;
-
-      slist_it_next (it);
-      if (ret_prev)
-        {
-          if (prev)
-            slist_it_next (prev);
-          else
-            prev = slist_iter (container->block.symtab);
-        }
-    }
-
-  if (ret_it)
-    *ret_it = it;
-  else
-    delete_slist_it (it);
-
-  if (ret_prev)
-    *ret_prev = prev;
-}
-
-int
-container_add_symbol (container_t * _self, symbol_t * sym,
-                      symtab_entry_kind_t internal)
-{
-  assert (_self != NULL);
-  assert (sym != NULL);
-  A60_USER_TO_REP (statement, self, *);
-  assert (a60_as_container (self));
-
-  if (internal == sek_ordinary
-      && container_find_name (_self, symbol_label (sym), type_any ()) != NULL)
-    return -1;
-
-  slist_pushback (self->block.symtab, sym);
-  return 0;
-}
-
-symbol_t *
-container_erase_symbol (container_t * _self, symbol_t * sym)
-{
-  assert (_self != NULL);
-  assert (sym != NULL);
-  A60_USER_TO_REP (statement, self, *);
-  assert (a60_as_container (self));
-
-  slist_it_t * pr, * it;
-  symbol_t * ret;
-
-  private_container_find_it (self, symbol_label (sym), symbol_type (sym), &pr, &it);
-
-  if (pr == NULL && it != NULL)
-    // found at the beginning
-    {
-      ret = slist_popfront (self->block.symtab);
-      delete_slist_it (it);
-    }
-  else
-    // found somewhere in the middle
-    {
-      assert (pr != NULL && it != NULL);
-      ret = slist_it_erase_after (pr);
-      delete_slist_it (pr);
-      delete_slist_it (it);
-    }
-
-  return ret;
-}
-
-symbol_t *
-container_find_name (container_t * _self, label_t const * lbl, type_t const * atype)
-{
-  assert (_self != NULL);
-  assert (lbl != NULL);
-  A60_USER_TO_REP (statement, self, *);
-  assert (a60_as_container (self));
-
-  slist_it_t * it;
-  private_container_find_it (self, lbl, atype, NULL, &it);
-  symbol_t * ret = slist_it_has (it) ? slist_it_get (it) : NULL;
-  delete_slist_it (it);
-  return ret;
-}
-
-symbol_t *
-container_find_name_rec (container_t * _self, label_t const * lbl, type_t const * atype)
-{
-  assert (_self != NULL);
-  assert (lbl != NULL);
-  A60_USER_TO_REP (statement, self, *);
-  assert (a60_as_container (self));
-
-  symbol_t * sym = container_find_name (_self, lbl, atype);
-  if (sym == NULL && self->parent != NULL)
-    return container_find_name_rec (self->parent, lbl, atype);
-  else
-    return sym;
-}
-
-symbol_t *
-container_find_name_rec_add_undefined (container_t * self, label_t const * lbl,
-                                       type_t * atype, logger_t * log,
-                                       cursor_t * cursor)
-{
-  assert (self != NULL);
-  assert (lbl != NULL);
-  assert (atype != NULL);
-  assert (log != NULL);
-  assert (a60_as_container (self));
-
-  symbol_t * found = container_find_name_rec (self, lbl, atype);
-  if (found == NULL)
-    {
-      if (types_same (atype, type_any ()))
-        log_printfc (log, ll_error, cursor,
-                     "(1) unknown symbol named `%s'",
-                     estr_cstr (label_id (lbl)));
-      else
-        {
-          // second chance: look up any symbol of that name
-          found = container_find_name_rec (self, lbl, type_any ());
-          if (found == NULL)
-            {
-              log_printfc (log, ll_error, cursor,
-                           "(2) unknown symbol named `%s'",
-                           estr_cstr (label_id (lbl)));
-            }
-          else
-            {
-              estring_t * t1s = type_to_str (atype, NULL);
-              estring_t * t2s = type_to_str (symbol_type (found), NULL);
-              estring_t * fmt =
-                new_estring_fmt ("type mismatch for symbol `%s': "
-                                 "requested type `%s', found type `%s'",
-                                 estr_cstr (label_id (lbl)),
-                                 estr_cstr (t1s), estr_cstr (t2s));
-              log_printfc (log, ll_error, cursor, "%s", estr_cstr (fmt));
-              delete_estring (fmt);
-              delete_estring (t2s);
-              delete_estring (t1s);
-            }
-        }
-      int was_there = container_add_symbol (self, new_symbol (lbl), sek_ordinary);
-      assert (!was_there);
-      found = container_find_name (self, lbl, atype);
-      // mark a type at new symbol, either fallback type_int, or
-      // atype, if it has suitable type
-      symbol_set_type (found, is_metatype (atype) ? type_int () : atype);
-    }
-  assert (found != NULL);
-
-  return found;
-}
-
-void
-stmt_toplev_define_internals (container_t * _self)
-{
-  assert (_self != NULL);
-  A60_USER_TO_REP (statement, self, *);
-  assert (a60_as_container (self));
-  assert (self->base.kind == sk_toplev);
-
-  struct interfun {
-    char const* n;
-    type_t * t;
-  } builtins [] =
-  {
-    // Algol 60 intrinsics
-    {"abs",  type_proc_real_real ()},
-    {"abs",  type_proc_int_int ()},
-    {"sign", type_proc_int_real ()},
-    {"sign", type_proc_int_int ()},
-    {"sqrt", type_proc_real_real ()},
-    {"sin",  type_proc_real_real ()},
-    {"cos",  type_proc_real_real ()},
-    {"arctan", type_proc_real_real ()},
-    {"ln",   type_proc_real_real ()},
-    {"exp",  type_proc_real_real ()},
-    {"entier", type_proc_int_real ()},
-    {"entier", type_proc_real_int ()},
-    // Extensions
-    {"exit", type_proc_void_int ()},
-    {"puts", type_proc_int_string ()},
-    //
-    {NULL,   NULL}
-  };
-
-  struct interfun * ptr = builtins;
-  for (; ptr->n != NULL; ptr++)
-    {
-      symbol_t * s = new_symbol (new_label (new_estring_from (ptr->n)));
-      symbol_set_type (s, ptr->t);
-      symbol_set_hidden (s, 1);
-      int fail = container_add_symbol (_self, s, sek_internal);
-      assert (fail == 0);
-    }
-}
-

trunk/gcc/gcc/algol60/statement.h

@@ -23 +23 @@
-#include "type.i"
-#include "estring.i"
+#include "a60_symtab.i"
-#include "visitor.i"
-#include "pd.h"
@@ -73 +74 @@
-container_t * new_stmt_toplev (cursor_t * cursor)
-  ATTRIBUTE_MALLOC;
-
-/// Create a copy of subtree starting at given statement.
-/// Cursor is shared, and parent is set to NULL, but other components
-/// are recursively cloned.
-statement_t * clone_statement (statement_t const * self)
-  ATTRIBUTE_MALLOC
-  ATTRIBUTE_NONNULL(1);
-
-/// The same as above, just with typing for containers.
-container_t * clone_container (container_t const * self)
-  ATTRIBUTE_MALLOC
-  ATTRIBUTE_NONNULL(1);
-
-/// Convert void* to statement, if it is statement, or abort.
@@ -187 +176 @@
-
-/// Answer the symtab associated with the container.
-slist
+a60_symtab
-  ATTRIBUTE_NONNULL(1);
-
-/// Answer the statement list associated with the container.
-slist_t * container_stmts (container_t const * self)
-  ATTRIBUTE_NONNULL(1);
-
-typedef enum enum_symtab_entry_kind_t
-{
-  sek_internal,
-  sek_ordinary
-} symtab_entry_kind_t;
-
-/// Add given symbol to the container and return 0.  It there already
-/// is other symbol with the same name, do nothing and return -1.
-/// `internal' is sek_internal for internal symbols (internal symbols
-/// may be overloaded) and sek_ordinary for ordinary symbols (which
-/// may not).
-int container_add_symbol (container_t * self, symbol_t * sym, symtab_entry_kind_t internal)
-  ATTRIBUTE_NONNULL(1)
-  ATTRIBUTE_NONNULL(2);
-
-/// Remove the symbol from symtab.  The symbol must be present in
-/// symtab.
-symbol_t * container_erase_symbol (container_t * self, symbol_t * sym)
-  ATTRIBUTE_NONNULL(1)
-  ATTRIBUTE_NONNULL(2);
-
-/// Look up given symbol in the container.  Answer first symbol that
-/// matches restriction `atype', or first symbol with matching name,
-/// if its type is NULL (in that case type can't be checked).  Return
-/// NULL if not found.
-symbol_t * container_find_name (container_t * self, label_t const * lbl, type_t const * atype)
-  ATTRIBUTE_NONNULL(1)
-  ATTRIBUTE_NONNULL(2);
-
-/// Lookup given symbol in the container, and if it fails, recursively
-/// in all parental containers. Answer first symbol that matches
-/// restriction `atype', or first symbol with matching name, if its
-/// type is NULL (in that case type can't be checked). Return NULL if
-/// not found.
-symbol_t * container_find_name_rec (container_t * self, label_t const * lbl, type_t const * atype)
-  ATTRIBUTE_NONNULL(1)
-  ATTRIBUTE_NONNULL(2);
-
-/// See if given symbol with requested matching type, is already
-/// defined somewhere in the scope.  If it's not, create new
-/// definition in most enclosing scope.  Answer either found, or newly
-/// created symbol.
-symbol_t * container_find_name_rec_add_undefined (container_t * self, label_t const * lbl, type_t * atype, logger_t * log, cursor_t * cursor)
-  ATTRIBUTE_NONNULL(1)
-  ATTRIBUTE_NONNULL(2)
-  ATTRIBUTE_NONNULL(3)
-  ATTRIBUTE_NONNULL(4);
-
-/// Populate given container with algol internal functions.  The
-/// container must be `stmt_toplev`.
-void stmt_toplev_define_internals (container_t * self)
-  ATTRIBUTE_NONNULL(1);
-

trunk/gcc/gcc/algol60/symbol.c

@@ -9 +9 @@
-#include "estring.h"
-#include "visitor.h"
+#include "logger.h"
-#include "visitor-impl.h"
-
-static char const * private_symbol_signature = "symbol";
+
+typedef struct struct_sym_var_t
+{
+}
+sym_var_t;
+
+typedef struct struct_sym_func_t
+{
+  /// List typed with a60_as_symbol, contains explicit parameters of
+  /// the function.
+  slist_t * params;
+
+  /// List typed with a60_as_symbol, contains symbols that are
+  /// unresolved in function body, and as such form implicit
+  /// parameters of the function.
+  slist_t * implied_params;
+
+  /// Body of this function.
+  statement_t * body;
+}
+sym_func_t;
+
+typedef enum enum_symbol_kind_t
+{
+  sk_var,
+  sk_func,
+}
+symbol_kind_t;
-
-struct struct_symbol_t
@@ -21 +50 @@
-  int hidden;
-  void * extra;
+
+  union {
+    sym_var_t sym_var;
+    sym_func_t sym_func;
+  };
-};
-
-static symbol_t *
-
+, symbol_kind_t kind
-{
-  symbol_t * ret = malloc (sizeof (symbol_t));
@@ -30 +64 @@
-  ret->base.signature = private_symbol_signature;
-#endif
+  ret->base.kind = kind;
-  ret->label = label;
-  return ret;
-}
-
-symbol_t *
-new_symbol (label_t const * label)
-{
-  assert (label != NULL);
-
-  symbol_t * ret = private_alloc_symbol (label);
-  ret->stmt = NULL;
-  ret->type = NULL;
@@ -48 +74 @@
-
-symbol_t *
+new_symbol_var (label_t const * label)
+{
+  assert (label != NULL);
+
+  symbol_t * ret = private_alloc_symbol (label, sk_var);
+  return ret;
+}
+
+symbol_t *
+new_symbol_func (label_t const * label)
+{
+  assert (label != NULL);
+
+  symbol_t * ret = private_alloc_symbol (label, sk_func);
+  return ret;
+}
+
+symbol_t *
-clone_symbol (symbol_t const * self)
-{
@@ -59 +103 @@
-  assert (label != NULL);
-
-
+, self->base.kind
-  ret->stmt = self->stmt;
-  ret->type = self->type;
-  ret->hidden = self->hidden;
-  ret->extra = self->extra;
+
+  switch (self->base.kind)
+    {
+    case sk_var:
+      break;
+
+    case sk_func:
+      break;
+    }
+
-  return ret;
-}
@@ -70 +124 @@
-delete_symbol (symbol_t * self)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -97 +163 @@
-
-void
+symbol_resolve_symbols (symbol_t * self, container_t * context, logger_t * log)
+{
+  switch (self->base.kind)
+    {
+    case sk_var:
+      type_resolve_symbols (self->type, context, log);
+      return;
+
+    case sk_func:
+      // @TODO: Do the right thing :)
+      log_printf (log, ll_info, "note: skipping resolve of function symbol.");
+      return;
+    }
+}
+
+void
-symbol_set_type (symbol_t * self, type_t * type)
-{

trunk/gcc/gcc/algol60/symbol.h

@@ -17 +17 @@
-#include "estring.i"
-#include "visitor.i"
+#include "logger.i"