Markus Armbruster
4366c5ac6e
according to context, to make `lstat * ?type#spy&spy>1' work. Closes bug#825363, #905809, #905814 and #922968. (nsc_type, packed_nsc_type, nsc_cat, packed_nsc_cat, nsc_flags): New. (valstr): New. Old code encoded values in type long, which was somewhat hard to read and could only support signed integer values. (nscstr): Redesign. Use valstr. Typed operator. (castr): Split ca_code into ca_type, ca_flags, ca_off. Tables changed. (nstr_comp, nstr_exec): Redesign and rewrite. Callers changed. They used the old design incorrectly, which let players smash the stack by supplying more than NCOND conditions. (encode, nstr_comp_val, decode, nstr_exec_val): Rename, redesign, and rewrite. Callers changed. (nstr_coerce_val): New. (var_ca, sect_ca, ship_ca, land_ca): Checking both var_ca[] and the object's ca complicates proper recognition of unique abbreviations. Copy contents of var_ca[] into the ca of objects, remove var_ca[]. (surv): Reject values with category other than NSC_OFF and types that can't be coerced to NSC_LONG. Old code happily passed values with category NSC_VAL to code_char(). The previous version interpreted them correctly, but earlier versions interpreted them as NSC_OFF, then logged `bad type in decode: 0' and evaluated them into zero. (code_char): Used to test category NSC_VAR to decide whether to display tens or hundreds. NSC_VAR no longer exists. Test type instead. Makes more sense anyway.
185 lines
5.8 KiB
C
185 lines
5.8 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* ---
|
|
*
|
|
* See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
|
|
* related information and legal notices. It is expected that any future
|
|
* projects/authors will amend these files as needed.
|
|
*
|
|
* ---
|
|
*
|
|
* nsc.h: Definitions for Empire conditionals
|
|
*
|
|
* Known contributors to this file:
|
|
* Dave Pare, 1989
|
|
* Markus Armbruster, 2004
|
|
*/
|
|
|
|
#ifndef _NSC_H_
|
|
#define _NSC_H_
|
|
|
|
#include <stddef.h>
|
|
#include "xy.h"
|
|
|
|
#define NS_LSIZE 128
|
|
#define NS_NCOND 16
|
|
|
|
/* Value type */
|
|
enum nsc_type {
|
|
NSC_NOTYPE,
|
|
/* promoted types */
|
|
NSC_LONG, /* long */
|
|
NSC_DOUBLE, /* double */
|
|
NSC_STRING, /* char *, zero-terminated string */
|
|
NSC_TYPEID, /* signed char, index into chr table */
|
|
/* unpromoted types */
|
|
NSC_CHAR, /* signed char */
|
|
NSC_UCHAR, /* unsigned char */
|
|
NSC_SHORT, /* short */
|
|
NSC_USHORT, /* unsigned short */
|
|
NSC_INT, /* int */
|
|
NSC_XCOORD, /* coord that needs x conversion */
|
|
NSC_YCOORD, /* coord that needs y conversion */
|
|
NSC_TIME, /* time_t */
|
|
NSC_FLOAT /* float */
|
|
};
|
|
typedef enum nsc_type nsc_type;
|
|
typedef char packed_nsc_type;
|
|
|
|
/* Value category */
|
|
enum nsc_cat {
|
|
NSC_NOCAT,
|
|
NSC_VAL, /* evaluated value */
|
|
NSC_OFF /* symbolic value: at offset in object */
|
|
};
|
|
typedef enum nsc_cat nsc_cat;
|
|
typedef char packed_nsc_cat;
|
|
|
|
enum {
|
|
NSC_DEITY = 1 /* access restricted to deity */
|
|
};
|
|
typedef unsigned char nsc_flags;
|
|
|
|
/*
|
|
* Value, possibly symbolic.
|
|
* If type is NSC_NOTYPE, it's an error value.
|
|
* If category is NSC_OFF, the value is at offset val_as.off in the
|
|
* context object.
|
|
* If category is NSC_VAL, the value is in val_as, and the type is a
|
|
* promoted type.
|
|
* Some values can also be interpreted as an object type. The values
|
|
* consumer chooses how to interpret it, depending on context.
|
|
*/
|
|
struct valstr {
|
|
packed_nsc_type val_type; /* type of value */
|
|
packed_nsc_cat val_cat; /* category of value */
|
|
signed char val_as_type; /* value interpreted as object type */
|
|
union {
|
|
ptrdiff_t off; /* cat NSC_OFF */
|
|
double dbl; /* cat NSC_VAL, types NSC_DOUBLE */
|
|
char *str; /* cat NSC_VAL, type NSC_STRING */
|
|
long lng; /* cat NSC_VAL, type NSC_LONG */
|
|
} val_as;
|
|
};
|
|
|
|
/* Compiled condition */
|
|
struct nscstr {
|
|
char operator; /* '<', '=', '>', '#' */
|
|
packed_nsc_type optype; /* operator type */
|
|
struct valstr lft; /* left operand */
|
|
struct valstr rgt; /* right operand */
|
|
};
|
|
|
|
struct nstr_sect {
|
|
coord x, y; /* current x-y */
|
|
coord dx, dy; /* accumlated x,y travel */
|
|
int id; /* return value of sctoff */
|
|
int type; /* type of query */
|
|
int curdist; /* dist query: current range */
|
|
struct range range; /* area of coverage */
|
|
int dist; /* dist query: range */
|
|
coord cx, cy; /* dist query: center x-y */
|
|
int (*read)(int type, int id, caddr_t ptr); /* read function */
|
|
int ncond; /* # of selection conditions */
|
|
struct nscstr cond[NS_NCOND]; /* selection conditions */
|
|
};
|
|
|
|
struct nstr_item {
|
|
int cur; /* current item */
|
|
int sel; /* selection type */
|
|
int type; /* item type being selected */
|
|
int curdist; /* if NS_DIST, current item's dist */
|
|
struct range range; /* NS_AREA/NS_DIST: range selector */
|
|
int dist; /* NS_DIST: distance selector */
|
|
coord cx, cy; /* NS_DIST: center x-y, NS_XY: xy */
|
|
int group; /* NS_GROUP: fleet/wing match */
|
|
int size; /* NS_LIST: size of list */
|
|
int index; /* NS_LIST: index */
|
|
int list[NS_LSIZE]; /* NS_LIST: item list */
|
|
int (*read)(int type, int id, caddr_t ptr); /* read function */
|
|
int flags; /* EFF_ flags */
|
|
int ncond; /* # of selection conditions */
|
|
struct nscstr cond[NS_NCOND]; /* selection conditions */
|
|
};
|
|
|
|
#define NS_UNDEF 0
|
|
#define NS_LIST 1
|
|
#define NS_DIST 2
|
|
#define NS_AREA 3
|
|
#define NS_ALL 4
|
|
#define NS_XY 5
|
|
#define NS_GROUP 6
|
|
|
|
/*
|
|
* Selector descriptor.
|
|
* Value is at offset CA_OFF in the context object.
|
|
*/
|
|
struct castr {
|
|
packed_nsc_type ca_type; /* type of value */
|
|
nsc_flags ca_flags;
|
|
unsigned short ca_len; /* non-zero: is an array; #array elements */
|
|
ptrdiff_t ca_off;
|
|
char *ca_name;
|
|
};
|
|
|
|
/* variables using the above */
|
|
|
|
extern struct castr sect_ca[];
|
|
extern struct castr ship_ca[];
|
|
extern struct castr plane_ca[];
|
|
extern struct castr land_ca[];
|
|
extern struct castr nuke_ca[];
|
|
extern struct castr news_ca[];
|
|
extern struct castr nat_ca[];
|
|
extern struct castr treaty_ca[];
|
|
extern struct castr trade_ca[];
|
|
extern struct castr loan_ca[];
|
|
extern struct castr genitem_ca[];
|
|
extern struct castr lost_ca[];
|
|
extern struct castr commodity_ca[];
|
|
|
|
/* src/lib/subs/nstr.c */
|
|
extern int nstr_comp(struct nscstr *np, int len, int type, char *str);
|
|
extern char *nstr_comp_val(char *, struct valstr*, int);
|
|
extern int nstr_coerce_val(struct valstr *, nsc_type, char *);
|
|
extern int nstr_exec(struct nscstr *, int, void *);
|
|
extern void nstr_exec_val(struct valstr *, natid, void *, nsc_type);
|
|
|
|
#endif /* _NSC_H_ */
|