Changeset 939

Timestamp:

06/14/07 14:21:29 (1 year ago)

Author:

walker

Message:

Added cond() and friends.

Files:

• 1.8.3/branches/devel/game/txt/hlp/pennfunc.hlp (modified) (1 diff)
• 1.8.3/branches/devel/src/function.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/funmisc.c (modified) (1 diff)

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

@@ -755 +755 @@
-
-See also: lcon(), next()
+& COND()
+& CONDALL()
+& NCOND()
+& NCONDALL()
+  cond(<cond1>, <expr1>, [<condN>, <exprN>], ...[<default>])
+  condall(<cond1>, <expr1>, [<condN>, <exprN>], ...[<default>])
+  ncond(<cond1>, <expr1>, [<condN>, <exprN>], ...[<default>])
+  ncondall(<cond1>, <expr1>, [<condN>, <exprN>], ...[<default>])
+
+  cond() evaluates <cond>s until one returns a boolean true value. Should
+  none return true, <default> is returned.
+
+  condall() returns all <expr>s for those <cond>s that evaluate to true.
+
+  ncond() and ncondall() are identical to cond(), except it returns <expr>s
+  for which <cond>s evaluate to false.
+
+  Examples:
+  > say cond(0,This is false,#-1,This is also false,#123,This is true)
+  You say, "This is true"
+
+  > say ncond(0,This is false,#-1,This is also false,#123,This is true)
+  You say, "This is false"
+  
+  > say ncondall(0,This is false,#-1,This is also false,#123,This is true)
+  You say, "This is falseThis is also false"
-& CONFIG()
-  config()

1.8.3/branches/devel/src/function.c

@@ -351 +351 @@
-  {"COMP", fun_comp, 2, 3, FN_REG},
-  {"CON", fun_con, 1, 1, FN_REG},
+  {"COND", fun_if, 2, INT_MAX, FN_NOPARSE},
+  {"CONDALL", fun_if, 2, INT_MAX, FN_NOPARSE},
-  {"CONFIG", fun_config, 1, 1, FN_REG},
-  {"CONN", fun_conn, 1, 1, FN_REG},
@@ -529 +531 @@
-  {"NCHILDREN", fun_lsearch, 1, 1, FN_REG},
-  {"NCON", fun_dbwalker, 1, 1, FN_REG},
+  {"NCOND", fun_if, 2, INT_MAX, FN_NOPARSE},
+  {"NCONDALL", fun_if, 2, INT_MAX, FN_NOPARSE},
-  {"NEXITS", fun_dbwalker, 1, 1, FN_REG},
-  {"NPLAYERS", fun_dbwalker, 1, 1, FN_REG},

1.8.3/branches/devel/src/funmisc.c

@@ -508 +508 @@
-  char tbuf[BUFFER_LEN], *tp;
-  char const *sp;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                       PE_DEFAULT, PT_DEFAULT, pe_info);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    process_expression(buff, bp, &sp, executor, caller, enactor,
-                       PE_DEFAULT, PT_DEFAULT, pe_info);