Changeset 909

Timestamp:

06/10/07 13:55:02 (1 year ago)

Author:

shawnw

Message:

#6174: letq(). Plus Added mush_calloc() and some conversion to array allocators to use it.

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (2 diffs)
• 1.8.3/branches/devel/game/txt/hlp/pennfunc.hlp (modified) (4 diffs)
• 1.8.3/branches/devel/hdrs/externs.h (modified) (2 diffs)
• 1.8.3/branches/devel/src/bsd.c (modified) (1 diff)
• 1.8.3/branches/devel/src/function.c (modified) (11 diffs)
• 1.8.3/branches/devel/src/funlist.c (modified) (11 diffs)
• 1.8.3/branches/devel/src/funmath.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/funmisc.c (modified) (1 diff)
• 1.8.3/branches/devel/src/htab.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/lock.c (modified) (1 diff)
• 1.8.3/branches/devel/src/utils.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/wild.c (modified) (1 diff)
• 1.8.3/branches/devel/test/testletq.pl (added)

1.8.3/branches/devel/CHANGES.183

@@ -36 +36 @@
-    time zone the time is displayed for: UTC or the server's. [SW]
-  * fn() by Javelin
+  * letq(). Suggested by Nathan Baum. [SW]
-  
-Fixes:
-  * Assorted compiler warning fixes. [SW]
-Won't compile
+Compile fix
-  * @sql wasn't enabled if Sqlite3 was the only database turned on.
-    Reported by qa'toq.
@@ -52 +53 @@
-  * User locks were broken in the last patch. Reported by Michael Brazaitis.
-    [SW]
+  * ./configure --without-ssl works. Reported by Starr. [SW]
-
-Version 1.8.3 patchlevel 2                      May 16, 2007

1.8.3/branches/devel/game/txt/hlp/pennfunc.hlp

@@ -224 +224 @@
-  clone()       create()      die()         dig()         firstof()
-  functions()   isdbref()     isint()       isnum()       isobjid()
-ocalize()    link()        list()        lnum
-null()        numversion()  objeval()     open()        pcreate
-r-function    rand()        s-function    scan()        set
-q()        setr()        soundex()     soundslike()  speak
-tel()         textentries() textfile()    valid()       wipe
-
+etq()        localize()    link()        list
+lnum()        null()        numversion()  objeval()     open
+pcreate()     r-function    rand()        s-function    scan
+()         setq()        setr()        soundex()     soundslike
+speak()       tel()         textentries() textfile()    valid
+wipe()        
-
-& @@()
@@ -1975 +1975 @@
-
-  nslemit() is a wizard-only variation that works like @nslemit.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-& LEXITS()
-  lexits(<object>)
@@ -2098 +2112 @@
-  You say, "Outside-Inside-Outside"
-
-
+letq(), 
-& LOCATE()
-  locate(<looker>, <name>, <parameters>)
@@ -3472 +3486 @@
-  Object says "bar"
-  Object says "foo"
-
-& SETUNION()
-  setunion(<list1>, <list2>[,<delimiter>[, <sort type>[, <osep>]]])

1.8.3/branches/devel/hdrs/externs.h

@@ -547 +547 @@
-      char *errmess;
-    } ufun_attrib;
-extern 
-       
-extern 
-       char *ret, dbref executor, dbref enactor,
-                     PE_Info *pe_info);
-extern int call_attrib(dbref thing, const char *attrname
-       const char *wenv_args[], int wenv_argc, char *ret,
-                       dbref enactor, PE_Info *pe_info
-extern int member(dbref thing, dbref lis
-extern int recursive_member(dbref disallow, dbref from, int coun
-extern dbref remove_first(dbref first, dbref wha
-extern dbref reverse(dbref list)
-extern Malloc_t mush_malloc(
-          
-extern 
-extern 
-extern 
-extern 
-extern 
-extern 
+
+
+
+char *ret, dbref executor, dbref enactor, PE_Info *pe_info);
+int call_attrib(dbref thing, const char *attrname,
+                const char *wenv_args[], int wenv_argc, char *ret
+dbref enactor, PE_Info *pe_info);
+int member(dbref thing, dbref list
+int recursive_member(dbref disallow, dbref from, int coun
+dbref remove_first(dbref first, dbref wha
+dbref reverse(dbref lis
+void *mush_malloc(size_t bytes, const char *check) __attribute_malloc__
+void *mush_calloc(size_t count, 
+
+
+
+
+
+
+
-    int can_interact(dbref from, dbref to, int type);
-
@@ -621 +621 @@
-    void save_global_regs(const char *funcname, char *preserve[]);
-    void restore_global_regs(const char *funcname, char *preserve[]);
+    void save_partial_global_reg(const char *funcname, char
+                                 *preserve[], int num);
+    void restore_partial_global_regs(const char *funcname, char
+                                     *preserve[]);
-    void free_global_regs(const char *funcname, char *preserve[]);
-    void init_global_regs(char *preserve[]);

1.8.3/branches/devel/src/bsd.c

@@ -1886 +1886 @@
-
-  if (!d->raw_input) {
-
-
-
+
-    if (!d->raw_input)
-      mush_panic("Out of memory");

1.8.3/branches/devel/src/function.c

@@ -44 +44 @@
- */
-
+/** Save a single q-register
+ */
+void
+save_partial_global_reg(const char *funcname, char *preserve[], int i)
+{
+  preserve[i] = mush_strdup(global_eval_context.renv[i], funcname);
+}
+
+/** Restore q-registers saved with save_partial_global_reg()
+ */
+void
+restore_partial_global_regs(const char *funcname, char *preserve[])
+{
+  int i;
+  for (i = 0; i < NUMQ; i++) {
+    if (preserve[i]) {
+      mush_strncpy(global_eval_context.renv[i], preserve[i], BUFFER_LEN);
+      mush_free(preserve[i], funcname);
+    }
+  }
+}
+
-/** Save a copy of the q-registers.
- * \param funcname name of function calling (for memory leak testing)
@@ -56 +78 @@
-      preserve[i] = NULL;
-    else {
-
-
+
-    }
-  }
@@ -72 +93 @@
-  for (i = 0; i < NUMQ; i++) {
-    if (preserve[i]) {
-strcpy(global_eval_context.renv[i], preserve[i]
+mush_strncpy(global_eval_context.renv[i], preserve[i], BUFFER_LEN
-      mush_free(preserve[i], funcname);
-      preserve[i] = NULL;
@@ -169 +190 @@
-      valr[i] = NULL;
-    else {
-
-
+
-    }
-  }
@@ -178 +198 @@
-      valw[i] = NULL;
-    else {
-
-
+
-    }
-  }
@@ -200 +219 @@
-    if (preserver[i]) {
-      /* There was a former address, so we can restore to it */
-strcpy(global_eval_context.rnxt[i], valr[i]
+mush_strncpy(global_eval_context.rnxt[i], valr[i], BUFFER_LEN
-      mush_free(valr[i], funcname);
-      valr[i] = NULL;
@@ -209 +228 @@
-    if (preservew[i]) {
-      /* There was a former address, so we can restore to it */
-strcpy(global_eval_context.wnxt[i], valw[i]
+mush_strncpy(global_eval_context.wnxt[i], valw[i], BUFFER_LEN
-      mush_free(valw[i], funcname);
-      valw[i] = NULL;
@@ -436 +455 @@
-  {"LEFT", fun_left, 2, 2, FN_REG},
-  {"LEMIT", fun_lemit, 1, -1, FN_REG},
+  {"LETQ", fun_letq, 1, INT_MAX, FN_NOPARSE},
-  {"LEXITS", fun_dbwalker, 1, 1, FN_REG},
-  {"LFLAGS", fun_lflags, 0, 1, FN_REG},
@@ -853 +873 @@
-function_init_postconfig(void)
-{
-
-
-
+
-}
-
@@ -1187 +1205 @@
-      int n = 0;
-
-malloc(sizeof(FUN *) * userfn_count
+calloc(userfn_count, sizeof(FUN *)
-      notify(player, T("Function Name                   Dbref #    Attrib"));
-      for (fp = (FUN *) hash_firstentry(&htab_user_function);
@@ -1208 +1226 @@
-      /* just print out the list of available functions */
-      safe_str(T("User functions:"), tbuf1, &bp);
-malloc(sizeof(char *) * userfn_count
+calloc(userfn_count, sizeof(char *)
-      for (fp = (FUN *) hash_firstentry(&htab_user_function);
-           fp; fp = (FUN *) hash_nextentry(&htab_user_function)) {

1.8.3/branches/devel/src/funlist.c

@@ -225 +225 @@
-  /* Break up the two lists into their respective elements. */
-
-(char **) mush_malloc(MAX_SORTSIZE *
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
+mush_calloc(MAX_SORTSIZE,
-
-  /* ptrs3 is destructively modified, but it's a copy of ptrs2, so we
-   * make it a straight copy of ptrs2 and freearr() on ptrs2. */
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
-
-  if (!ptrs1 || !ptrs2)
@@ -263 +263 @@
-   * NULL to handle duplicates
-   */
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
-  if (!results)
-    mush_panic("Unable to allocate memory in fun_munge");
@@ -316 +316 @@
-  }
-
-(char **) mush_malloc(MAX_SORTSIZE *
-(char *) 
+mush_calloc(MAX_SORTSIZE,
+
-  if (!ptrs || !wordlist)
-    mush_panic("Unable to allocate memory in fun_elements");
@@ -786 +786 @@
-    return;
-
-(char **) mush_malloc(MAX_SORTSIZE *
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
+mush_calloc(MAX_SORTSIZE,
-  if (!a1 || !a2)
-    mush_panic("Unable to allocate memory in fun_inter");
@@ -916 +916 @@
-    return;
-
-(char **) mush_malloc(MAX_SORTSIZE *
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
+mush_calloc(MAX_SORTSIZE,
-  if (!a1 || !a2)
-    mush_panic("Unable to allocate memory in fun_setunion");
@@ -1054 +1054 @@
-    return;
-
-(char **) mush_malloc(MAX_SORTSIZE *
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
+mush_calloc(MAX_SORTSIZE,
-  if (!a1 || !a2)
-    mush_panic("Unable to allocate memory in fun_diff");
@@ -1175 +1175 @@
-    return;
-
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
-
-  if (!a1)
@@ -1183 +1183 @@
-  n1 = list2arr_ansi(a1, MAX_SORTSIZE, args[0], sep);
-
-malloc(n1 *
+calloc(n1,
-  if (!a2)
-    mush_panic("Unable to allocate memory in fun_unique");
@@ -2061 +2061 @@
-  }
-
-(char **) mush_malloc(sizeof(char *) * BUFFER_LEN
+mush_calloc(BUFFER_LEN, sizeof(char *)
-
-  origcount = count = list2arr_ansi(words, BUFFER_LEN, args[0], sep);
-  if (count == 0) {
-(Malloc_t) 
+
-    return;
-  }
@@ -2075 +2075 @@
-  }
-  freearr(words, origcount);
-(Malloc_t) 
+
-}
-
@@ -2106 +2106 @@
-  osep[1] = '\0';
-
-(char **) mush_malloc(MAX_SORTSIZE *
-(char **) mush_malloc(MAX_SORTSIZE *
+mush_calloc(MAX_SORTSIZE,
+mush_calloc(MAX_SORTSIZE,
-  /* Turn them into lists */
-  ocount = list2arr(orig, MAX_SORTSIZE, args[0], sep);

1.8.3/branches/devel/src/funmath.c

@@ -1798 +1798 @@
-
-  /* Allocate memory */
-(char **) mush_malloc(sizeof(char *) * BUFFER_LEN
+mush_calloc(BUFFER_LEN, sizeof(char *)
-
-  nptr = list2arr(ptr, BUFFER_LEN, args[1], sep);
@@ -1806 +1806 @@
-  if (!op) {
-    safe_str(T("#-1 UNKNOWN OPERATION"), buff, bp);
-(Malloc_t) 
+
-    return;
-  }
-  op->func(ptr, nptr, buff, bp);
-
-(Malloc_t) 
+
-}
-

1.8.3/branches/devel/src/funmisc.c

@@ -195 +195 @@
-    } else
-      safe_str(T("#-1 REGISTER OUT OF RANGE"), buff, bp);
+  }
+}
+
+FUNCTION(fun_letq)
+{
+  char **values = NULL;
+  int *regs = NULL;
+  int npairs;
+  int n;
+  char tbuf[BUFFER_LEN], *tbp;
+  char *preserve[NUMQ];
+  const char *p;
+
+  if ((nargs % 2) != 1) {
+    safe_str(T("#-1 FUNCTION (letq) EXPECTS AN ODD NUMBER OF ARGUMENTS"),
+             buff, bp);
+    return;
+  }
+
+  npairs = (nargs - 1) / 2;
+
+  for (n = 0; n < NUMQ; n++)
+    preserve[n] = NULL;
+
+  if (npairs) {
+    values = mush_calloc(npairs, sizeof(char *), "letq.values");
+    if (!values) {
+      safe_str(T("#-1 UNABLE TO ALLOCATE MEMORY"), buff, bp);
+      return;
+    }
+
+    regs = mush_calloc(npairs, sizeof(int), "letq.registers");
+    if (!regs) {
+      safe_str(T("#-1 UNABLE TO ALLOCATE MEMORY"), buff, bp);
+      mush_free(values, "letq.values");
+      return;
+    }
+
+    for (n = 0; n < npairs; n++) {
+      int i = n * 2;
+
+      tbp = tbuf;
+      p = args[i];
+      process_expression(tbuf, &tbp, &p, executor, caller, enactor, PE_DEFAULT,
+                         PT_DEFAULT, pe_info);
+      *tbp = '\0';
+      regs[n] = qreg_indexes[(unsigned char) tbuf[0]];
+      if (regs[n] < 0) {
+        safe_str(T("#-1 REGISTER OUT OF RANGE"), buff, bp);
+        goto cleanup;
+      }
+
+      tbp = tbuf;
+      p = args[i + 1];
+      process_expression(tbuf, &tbp, &p, executor, caller, enactor, PE_DEFAULT,
+                         PT_DEFAULT, pe_info);
+      *tbp = '\0';
+      values[n] = mush_strdup(tbuf, "letq.value");
+      if (!values[n]) {
+        safe_str(T("#-1 UNABLE TO ALLOCATE MEMORY"), buff, bp);
+        goto cleanup;
+      }
+    }
+
+    for (n = 0; n < npairs; n++) {
+      save_partial_global_reg("letq", preserve, regs[n]);
+      mush_strncpy(global_eval_context.renv[regs[n]], values[n], BUFFER_LEN);
+    }
+  }
+  p = args[nargs - 1];
+  process_expression(buff, bp, &p, executor, caller, enactor, PE_DEFAULT,
+                     PT_DEFAULT, pe_info);
+
+cleanup:
+  if (regs)
+    mush_free(regs, "letq.regs");
+  if (values) {
+    restore_partial_global_regs("letq", preserve);
+    for (n = 0; n < npairs; n++)
+      mush_free(values[n], "letq.value");
+    mush_free(values, "letq.values");
-  }
-}

1.8.3/branches/devel/src/htab.c

@@ -163 +163 @@
-hash_init(HASHTAB *htab, int size, int data_size, void (*free_data) (void *))
-{
-  int i;
-
-  htab->mask = get_hashmask(&size);
-  htab->hashsize = size;
-  htab->entries = 0;
-
-
-
-
+
-  htab->entry_size = data_size;
-  htab->free_data = free_data;
@@ -257 +252 @@
-  htab->hashsize = size;
-  newarr =
-malloc(size *
+calloc(size,
-  htab->buckets = newarr;
-  for (i = 0; i < size; i++)
-    newarr[i] = NULL;
-
-  for (i = 0; i < osize; i++) {

1.8.3/branches/devel/src/lock.c

@@ -306 +306 @@
-    size_t n;
-
-malloc(sizeof(lock_list) * LOCKS_PER_PAGE
+calloc(LOCKS_PER_PAGE, sizeof(lock_list)
-
-    if (!ll)

1.8.3/branches/devel/src/utils.c

@@ -64 +64 @@
- * \return allocated block of memory or NULL.
- */
-
-
-
-
+
+
+
+
+
+
+
+
-  add_check(check);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  return ptr;
-}
@@ -83 +104 @@
- */
-void
-
-
+
-{
-  del_check(check);

1.8.3/branches/devel/src/wild.c

@@ -560 +560 @@
-   */
-
-i < subpatterns && len > 1
+(int) i < subpatterns && (size_t) len > i
-    ssize_t sublen;
-    const char *submatch;