Changeset 1162

Timestamp:

11/24/07 02:24:13 (10 months ago)

Author:

shawnw

Message:

#5822: Dynamic switch table

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (1 diff)
• 1.8.3/branches/devel/hdrs/command.h (modified) (3 diffs)
• 1.8.3/branches/devel/hdrs/strtree.h (modified) (1 diff)
• 1.8.3/branches/devel/src/cmdlocal.dst (modified) (3 diffs)
• 1.8.3/branches/devel/src/command.c (modified) (23 diffs)
• 1.8.3/branches/devel/src/strtree.c (modified) (2 diffs)

1.8.3/branches/devel/CHANGES.183

@@ -34 +34 @@
- * A wildcard help topic search (help foo*) that only matches one
-   entry will display that entry. Suggested by Cheetah.
+ * New switches for commands no longer have to be added to the
+   SWITCHES file; the internal list of switches is now built based on
+   what switches are given in the command table and cmdlocal.c
+   additions. Suggested by Talek. 
+
-
-Flags and powers:

1.8.3/branches/devel/hdrs/command.h

@@ -2 +2 @@
-#define __COMMAND_H
-
-
-
+
+
+
+
+
-#define SW_SET(m,n)     (m[(n) >> 3] |= (1 << ((n) & 0x7)))
-#define SW_CLR(m,n)     (m[(n) >> 3] &= ~(1 << ((n) & 0x7)))
-#define SW_ISSET(m,n)   (m[(n) >> 3] & (1 << ((n) & 0x7)))
-
+
+
+
-
-/* These are type restrictors */
@@ -129 +134 @@
-  object_flag_type flagmask;    /**< Flags to which the command is restricted */
-  object_flag_type powers;      /**< Powers to which the command is restricted */
-
+
+
+
+
+
-  /** Hooks on this command.
-   */
@@ -189 +198 @@
-#include "switches.h"
-
-extern switch_mask *
-extern 
-extern 
-extern 
+switch_mask 
+
+
+
-  (const char *name, int type, const char *flagstr, const char *powers,
-   const char *switchstr, command_func func);
-extern 
+
-  (const char *name, int type, object_flag_type flagmask,
-switch_mask
-extern 
-       
-       object_flag_type powers, switch_mask *
-       
-extern 
-extern 
-extern 
-extern 
-extern 
+const char
+
+
+object_flag_type powers, switch_mask 
+
+
+
+
+
+
-  (dbref player, dbref cause, char *from, char *to, char **args,
-   COMMAND_INFO *cmd, int side);
-extern 
+
-  (dbref player, dbref cause, char **from, char *to, char **argv,
-   COMMAND_INFO *cmd, int side, int forcenoparse);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-

1.8.3/branches/devel/hdrs/strtree.h

@@ -37 +37 @@
-void st_delete(char const *s, StrTree *root);
-void st_print(StrTree *root);
+typedef void (*STFunc) (const char *, int, void *);
+void st_walk(StrTree *, STFunc, void *);
-void st_flush(StrTree *root);
-

1.8.3/branches/devel/src/cmdlocal.dst

@@ +1 @@
+/* -*- c -*-
-/*-----------------------------------------------------------------
- * Local stuff
@@ -53 +54 @@
-  if (SW_ISSET(sw, SWITCH_NOISY))
-    notify_format(player, "Noisy silly with %s", arg_left);
+  if (SW_BY_NAME(sw, "VERY"))
+    notify(player, "The following line will be very silly indeed.");
-  notify_format(player, "SillyCommand %s", arg_left);
-}
@@ -76 +79 @@
-{
-#ifdef EXAMPLE
- "NOISY NOEVAL",
-
+
+"NOISY NOEVAL VERY", 
-#endif
-}

1.8.3/branches/devel/src/command.c

@@ -14 +14 @@
-
-#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
-
-#include "conf.h"
@@ -28 +30 @@
-#include "ptab.h"
-#include "htab.h"
+#include "strtree.h"
-#include "function.h"
-#include "command.h"
@@ -46 +49 @@
-static const char *command_isattr(char *command);
-static int command_check(dbref player, COMMAND_INFO *cmd);
-
+onst c
-static void strccat(char *buff, char **bp, const char *from);
-static int has_hook(struct hook_data *hook);
-
+ 
-extern int global_fun_recursions;       /**< Counter for function recursion */
+
+SWITCH_VALUE *dyn_switch_list = NULL;
+int switch_bytes = 0;
+size_t num_switches = 0;
+
+enum command_load_state { CMD_LOAD_BUILTIN,
+  CMD_LOAD_LOCAL,
+  CMD_LOAD_DONE
+};
+static enum command_load_state command_state = CMD_LOAD_BUILTIN;
+static StrTree switch_names;
-
-int run_hook(dbref player, dbref cause, struct hook_data *hook,
@@ -396 +410 @@
-};
-
-
-static void
-strccat(char *buff, char **bp, const char *from)
@@ -404 +417 @@
-  safe_str(from, buff, bp);
-}
+
+/* Comparison function for bsearch() */
-static int
-
+
+
+
+
+
+
+
+
+
+
-{
-  SWITCH_VALUE *sw_val;
-
-
-
+
+
-    return 0;
-
-
-
+
-  if (!cmd) {
+    sw_val = bsearch(sw, dyn_switch_list, num_switches, sizeof(SWITCH_VALUE),
+                     switch_cmp);
+    if (sw_val)
+      return sw_val->value;
+    else
+      return 0;
+  } else {
+    size_t len = strlen(sw);
+    sw_val = dyn_switch_list;
-    while (sw_val->name) {
-
+
+
-        return sw_val->value;
-      sw_val++;
-    }
-    return 0;
-  } else {
-    while (sw_val->name) {
-      i++;
-      if (SW_ISSET(cmd->sw, i) && (strncmp(sw_val->name, sw, len) == 0))
-        return i;
-      sw_val++;
-    }
-  }
-  return 0;
+}
+
+/** Test if a particular switch was given, using name
+ * \param sw the switch mask to test
+ * \param name the name of the switch to test for.
+ */
+bool
+SW_BY_NAME(switch_mask sw, const char *name)
+{
+  int idx = switch_find(NULL, name);
+  if (idx)
+    return SW_ISSET(sw, idx);
+  else
+    return false;
-}
-
@@ -448 +485 @@
-make_command(const char *name, int type,
-             object_flag_type flagmask, object_flag_type powers,
-switch_mask
+const char
-{
-  COMMAND_INFO *cmd;
@@ -459 +496 @@
-  cmd->flagmask = flagmask;
-  cmd->powers = powers;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  cmd->hooks.before.obj = NOTHING;
-  cmd->hooks.before.attrname = NULL;
@@ -489 +547 @@
-{
-  object_flag_type flagmask = NULL, powers = NULL;
-  switch_mask *sw = switchmask(switchstr);
-
-  if (flagstr)
@@ -496 +553 @@
-    powers = string_to_bits("POWER", powerstr);
-  ptab_insert_one(&ptab_command, name,
-
+itchstr
-  return command_find(name);
-}
@@ -556 +613 @@
-command_modify(const char *name, int type,
-               object_flag_type flagmask, object_flag_type powers,
-*
+
-{
-  COMMAND_INFO *cmd;
@@ -569 +626 @@
-    cmd->powers = powers;
-  if (sw)
-memcpy(cmd->sw, sw, sizeof(switch_mask)
+SW_COPY(cmd->sw.mask, sw
-  if (func)
-    cmd->func = func;
@@ -581 +638 @@
- * \return pointer to a static switch mask.
- */
- *
+
-switchmask(const char *switches)
-{
-
+
+
-  char buff[BUFFER_LEN];
-  char *p, *s;
-  int switchnum;
+
+  if (sm_bytes < switch_bytes) {
+    sw = mush_realloc(sw, switch_bytes, "cmd.switch.vector");
+    sm_bytes = switch_bytes;
+  }
+
-  SW_ZERO(sw);
-  if (!switches || !switches[0])
@@ -601 +665 @@
-      SW_SET(sw, switchnum);
-  }
-&
+
-}
-
@@ -617 +681 @@
-  hashadd(strupper(a), (void *) placeholder, &htab_reserved_aliases);
-}
+
+static StrTree switch_names;
-
-/** Initialize command tables (before reading config file).
@@ -632 +698 @@
-  struct command_perms_t *c;
-  COMLIST *cmd;
+  SWITCH_VALUE *sv;
-  static int done = 0;
-  if (done == 1)
@@ -639 +706 @@
-  ptab_init(&ptab_command);
-  hashinit(&htab_reserved_aliases, 16);
+
+  /* Build initial switch table. */
+  st_init(&switch_names);
+  for (sv = switch_list; sv->name; sv++)
+    st_insert(sv->name, &switch_names);
+
-  command_slab = slab_create("commands", sizeof(COMMAND_INFO));
-  reserve_aliases();
+
-  ptab_start_inserts(&ptab_command);
+  command_state = CMD_LOAD_BUILTIN;
-  for (cmd = commands; cmd->name; cmd++) {
+    if (cmd->switches) {
+      char sw_copy[BUFFER_LEN];
+      char *pos;
+      strcpy(sw_copy, cmd->switches);
+      pos = sw_copy;
+      while (pos) {
+        char *sw = split_token(&pos, ' ');
+        st_insert(sw, &switch_names);
+      }
+    }
-    ptab_insert(&ptab_command, cmd->name,
-                make_command(cmd->name, cmd->type,
-                             string_to_bits("FLAG", cmd->flagstr),
-                             string_to_bits("POWER", cmd->powers),
-switchmask(cmd->switches)
+cmd->switches
-  }
-  ptab_end_inserts(&ptab_command);
@@ -657 +742 @@
-  ptab_end_inserts(&ptab_command_perms);
-
+  command_state = CMD_LOAD_LOCAL;
-  local_commands();
+}
+
+struct bst_data {
+  SWITCH_VALUE *table;
+  size_t n;
+  size_t start;
+};
+
+static void
+build_switch_table(const char *sw, int count __attribute__ ((__unused__)),
+                   void *d)
+{
+  SWITCH_VALUE *s;
+  struct bst_data *data = d;
+
+  for (s = switch_list; s->name; s++) {
+    if (strcmp(s->name, sw) == 0) {
+      data->table[data->n++] = *s;
+      return;
+    }
+  }
+  /* Not in switchinc.c table */
+  data->table[data->n].value = data->start++;
+  data->table[data->n++].name = mush_strdup(sw, "switch.name");
-}
-
@@ -668 +778 @@
-command_init_postconfig(void)
-{
+  struct bst_data sw_data;
+  COMMAND_INFO *c;
+  size_t sl_size;
+
+  command_state = CMD_LOAD_DONE;
+
+  /* First make the switch table */
+  dyn_switch_list = mush_calloc(switch_names.count + 2, sizeof(SWITCH_VALUE),
+                                "cmd_switch_table");
+  if (!dyn_switch_list)
+    mush_panic(T("Unable to allocate command switch table"));
+  sw_data.table = dyn_switch_list;
+  sw_data.n = 0;
+  sw_data.start = sizeof switch_list / sizeof(SWITCH_VALUE);
+  sl_size = sw_data.start - 2;
+  st_walk(&switch_names, build_switch_table, &sw_data);
+  num_switches = sw_data.start;
+  dyn_switch_list[sw_data.n].name = NULL;
+  st_flush(&switch_names);
+  switch_bytes = ceil((double) num_switches / 8.0);
+
+  /* Then convert the list of switch names in all commands to masks */
+  for (c = ptab_firstentry(&ptab_command); c; c = ptab_nextentry(&ptab_command)) {
+    const char *switchstr = c->sw.names;
+    if (switchstr) {
+      c->sw.mask = SW_ALLOC();
+      SW_COPY(c->sw.mask, switchmask(switchstr));
+    }
+  }
+
-  return;
-}
@@ -869 +1009 @@
-  char b;
-  int switchnum;
-
+ = NULL
-  char switch_err[BUFFER_LEN], *se;
-  int noeval;
@@ -877 +1017 @@
-  rhs_present = 0;
-
-(char *) 
-(char *) 
-(char *) 
-(char *) 
-(char *) 
+
+
+
+
+
-  if (!command || !swtch || !ls || !rs || !switches)
-    mush_panic("Couldn't allocate memory in command_parse");
@@ -1062 +1202 @@
-  }
-  /* Parse out any switches */
-SW_ZERO(sw
+sw = SW_ALLOC(
-  swp = switches;
-  *swp = '\0';
@@ -1227 +1367 @@
-  }
-
+  SW_FREE(sw);
-  command_parse_free_args;
-  return retval;
@@ -1620 +1761 @@
-    buff[0] = '\0';
-    notify(player, show_command_flags(command->flagmask, command->powers));
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    buff[0] = '\0';
-    bp = buff;

1.8.3/branches/devel/src/strtree.c

@@ -531 +531 @@
-}
-
+static void
+st_node_walk(StrNode *node, STFunc callback, void *data)
+{
+  if (node->left)
+    st_node_walk(node->left, callback, data);
+  callback(node->string, node->info >> ST_COLOR, data);
+  if (node->right)
+    st_node_walk(node->right, callback, data);
+}
+
+/** Call a function for each node in the tree, in-order */
+void
+st_walk(StrTree *tree, STFunc callback, void *data)
+{
+  if (!tree || !tree->root)
+    return;
+  st_node_walk(tree->root, callback, data);
+}
+
-/* Print the tree, for debugging purposes. */
-static void
@@ -589 +608 @@
-    (*perms)++;
-  else
-
+ >> ST_COLOR
-
-  if (count > *maxdepth)