Changeset 170

Timestamp:

05/12/07 19:33:47 (1 year ago)

Author:

ant_39

Message:

• Second resolution is now done locally in expression.c, no need to have direct support of symtab for this.
  
• Unrelated: callback of slist_each changed to more traditional type. User can still pass list itself in userdata e.g. via structure.
  

Files:

• trunk/gcc/gcc/algol60/a60_symtab.c (modified) (1 diff)
• trunk/gcc/gcc/algol60/a60_symtab.h (modified) (1 diff)
• trunk/gcc/gcc/algol60/expression.c (modified) (3 diffs)
• trunk/gcc/gcc/algol60/slist.c (modified) (3 diffs)
• trunk/gcc/gcc/algol60/slist.h (modified) (1 diff)

trunk/gcc/gcc/algol60/a60_symtab.c

@@ -218 +218 @@
-    }
-  delete_slist_it (it);
-}
-
-int
-a60_symtab_second_resolve_symbols (a60_symtab_t * self, slist_t * ret_list,
-                                   a60_symtab_t * context_tab,
-                                   logger_t * log, cursor_t * cursor)
-{
-  int ret = 1;
-  slist_it_t * it = slist_iter (self->table);
-  for (; slist_it_has (it); slist_it_next (it))
-    {
-      symbol_t * sym = slist_it_get (it);
-      label_t const * label = symbol_label (sym);
-
-      // Skip symbols that are not implied parameters.
-      if (!type_is_implicit (symbol_type (sym)))
-        continue;
-
-      symbol_t * found =
-        a60_symtab_find_name_rec (context_tab, label, type_any ());
-      if (found == NULL)
-        {
-          /*
-          int was_there = a60_symtab_add_symbol (context_tab, new_symbol_var (label),
-                                                 sek_ordinary);
-          assert (!was_there);
-          found = a60_symtab_find_name (self, label, type_any ());
-          symbol_set_type (found, type_unknown ());
-          */
-
-          log_printfc (log, ll_error, a60_as_cursor (symbol_extra (sym)),
-                       "implicit parameter `%s'",
-                       estr_cstr (label_id (label)));
-          log_printfc (log, ll_error, cursor,
-                       "cannot be resolved at this point in file.");
-
-          ret = 0;
-        }
-      else
-        slist_pushback (ret_list, sym /*found*/);
-    }
-
-  slist_it_reset (it, ret_list);
-  for (; slist_it_has (it); slist_it_next (it))
-    a60_symtab_erase_symbol (self, a60_as_symbol (slist_it_get (it)));
-
-  delete_slist_it (it);
-
-  return ret;
-}
-

trunk/gcc/gcc/algol60/a60_symtab.h

@@ -93 +93 @@
-  ATTRIBUTE_NONNULL(1);
-
-/// For resolution of implicit function parameters.  This takes each
-/// symbol in the symbol table, and adds into list `ret_list` a
-/// symbols found by recursive lookup in `context_tab`.  The symbtab
-/// `self` will be function's symbol table with implicit and explicit
-/// parameters; `context_tab` will be symtab of call site.
-///
-/// Only the symbols in `self` that are of type `implicit' are looked
-/// up this way.
-///
-/// The function returns 1 if all symbols were resolved, or 0 if there
-/// were resolution errors.
-int a60_symtab_second_resolve_symbols (a60_symtab_t * self, slist_t * ret_list, a60_symtab_t * context_tab, logger_t * log, cursor_t * cursor)
-  ATTRIBUTE_NONNULL(1)
-  ATTRIBUTE_NONNULL(2)
-  ATTRIBUTE_NONNULL(3);
-
-typedef symbol_t * (* a60_symtab_missing_handler_t) (a60_symtab_t * self, label_t const * lbl, type_t const * atype, logger_t * log, cursor_t * cursor, void * data);
-

trunk/gcc/gcc/algol60/expression.c

@@ -714 +714 @@
-}
-
+typedef struct {
+  a60_symtab_t * context_tab;
+  logger_t * log;
+  cursor_t * cursor;
+  slist_t * resolved;
+  int status;
+}
+private_resolve_context_t;
+
+static void *
+private_resolve_implicit_callback (symbol_t * sym, void * data)
+{
+  private_resolve_context_t * ctx = data;
+  label_t const * label = symbol_label (sym);
+
+  // Skip symbols that are not implied parameters.
+  if (!type_is_implicit (symbol_type (sym)))
+    return NULL;
+
+  symbol_t * found =
+    a60_symtab_find_name_rec (ctx->context_tab, label, type_any ());
+
+  if (found != NULL)
+    slist_pushback (ctx->resolved, sym);
+  else
+    {
+      log_printfc (ctx->log, ll_error, a60_as_cursor (symbol_extra (sym)),
+                   "implicit parameter `%s'",
+                   estr_cstr (label_id (label)));
+      log_printfc (ctx->log, ll_error, ctx->cursor,
+                   "cannot be resolved at this point in file.");
+
+      ctx->status = 0;
+    }
+
+  return NULL;
+}
+
-static void
-private_resolve_symbols_call (expression_t * self,
@@ -771 +809 @@
-      container_t * f_container = a60_as_container (f_stmt);
-      a60_symtab_t * f_implicit = container_symtab (f_container);
-      slist_t * resolved = new_slist ();
-      int e_messages = log_count_messages (log, ll_error);
-      int w_messages = log_count_messages (log, ll_warning);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-          assert (container_parent (f_container) == NULL);
@@ -789 +836 @@
-            log_printfc (log, level, self->cursor, "at this point in file.");
-        }
-      delete_slist (resolved);
-    }
-}

trunk/gcc/gcc/algol60/slist.c

@@ -402 +402 @@
-slist_each (
-  slist_t * list,
-slist_t *, 
+
-  void * userdata)
-{
@@ -412 +412 @@
-    {
-      void * obj = node->object;
-list, 
+
-    }
-}
@@ -565 +565 @@
-
-void
-slist_t * list, void * obj, void * pctr
-
-pctr
+void * obj, void * userdata
+
+userdata
-}
-
-int
-slist_t * list, 
+
-{
-  return (int)obj % 2;

trunk/gcc/gcc/algol60/slist.h

@@ -113 +113 @@
-/// Apply the function `fn' to each element of the list `list'.  The
-/// argument `userdata' will be passed over to fn verbatim.  The
-
-
-
+
+
-void slist_each (
-  slist_t * list,
-slist_t * /*list*/, 
+
-  void * userdata)
-  ATTRIBUTE_NONNULL(1)