X-Git-Url: https://git.distorted.org.uk/~mdw/anag/blobdiff_plain/60dffc01674ffe3b92a9ae717f149984a8db78ad..345f33ea7a273e3196075b07fcc0bc28714793a5:/anag.c

diff --git a/anag.c b/anag.c
index f160fa1..616461c 100644
--- a/anag.c
+++ b/anag.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: anag.c,v 1.2 2001/02/07 09:09:11 mdw Exp $
+ * $Id: anag.c,v 1.8 2004/04/08 01:36:19 mdw Exp $
  *
  * Main driver for anag
  *
@@ -26,17 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: anag.c,v $
- * Revision 1.2  2001/02/07 09:09:11  mdw
- * Fix spurious error when `-file' is used.
- *
- * Revision 1.1  2001/02/04 17:14:42  mdw
- * Initial checkin
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "anag.h"
@@ -64,17 +53,38 @@ static void help(FILE *fp)
   usage(fp);
   fputs("\n\
 Searches a wordlist, printing all of the words which match an expression.\n\
+\n\
+Options supported are:\n\
+\n\
+-h, --help		display this help text\n\
+-v, --version		display the program's version number\n\
+-u, --usage		display a very brief usage message\n\
+-f, --file FILE		read wordlist from FILE, not `" DICTIONARY "'\n\
+\n\
 The basic tests in the expression are:\n\
 \n\
 -anagram WORD		matches a full-length anagram\n\
 -subgram WORD		matches words which only use letters in WORD\n\
 -wildcard PATTERN	matches with wildcards `*' and `?'\n\
 -trackword WORD		matches words which can be found in a trackword\n\
+-mono PATTERN		matches words isomorphic to the given PATTERN\n\
+"
+#ifdef HAVE_REGCOMP
+"\
+-regexp REGEXP		matches with an (extended) regular expression\n\
+"
+#endif
+#ifdef HAVE_PCRE
+"\
+-pcre REGEXP		matches with a Perl-like regular expression\n\
+"
+#endif
+"\
 \n\
 These simple tests can be combined using the operators `-a', `-o' and `-n'\n\
 (for `and', `or' and `not'; they may also be written `&', `|' and `!' if\n\
 you like), and grouped using parentheses `(' and `)'.\n\
-", fp);
+", fp); /*"*/
 }
 
 /*----- The options parser ------------------------------------------------*/
@@ -92,7 +102,7 @@ enum {
   O_HELP, O_VERSION, O_USAGE,
   O_FILE,
   O_AND, O_OR, O_NOT, O_LPAREN, O_RPAREN,
-  O_ANAG, O_SUBG, O_WILD, O_TRACK,
+  O_ANAG, O_SUBG, O_WILD, O_TRACK, O_REGEXP, O_PCRE, O_MONO,
   O_EOF
 };
 
@@ -122,6 +132,13 @@ static const struct opt opttab[] = {
   { "subgram",		1,	0,		O_SUBG },
   { "wildcard",		1,	0,		O_WILD },
   { "trackword",	1,	0,		O_TRACK },
+  { "mono",		1,	0,		O_MONO },
+#ifdef HAVE_REGCOMP
+  { "regexp",		1,	0,		O_REGEXP },
+#endif
+#ifdef HAVE_PCRE
+  { "pcre",		1,	0,		O_PCRE },
+#endif
 
   /* --- End marker --- */
 
@@ -308,7 +325,7 @@ static void p_factor(p_ctx *p, node **nn)
     p_next(p);
     p_expr(p, nn);
     if (p->t != O_RPAREN)
-      die("syntax error near `%s': missing `('", *p->a);
+      die("syntax error near `%s': missing `)'", *p->a);
     p_next(p);
   } else if (p->t == O_NOT) {
     n = xmalloc(sizeof(node_un));
@@ -322,6 +339,13 @@ static void p_factor(p_ctx *p, node **nn)
       case O_SUBG: *nn = subgram(p->a + 1); break;
       case O_WILD: *nn = wildcard(p->a + 1); break;
       case O_TRACK: *nn = trackword(p->a + 1); break;
+#ifdef HAVE_REGCOMP
+      case O_REGEXP: *nn = regexp(p->a + 1); break;
+#endif
+#ifdef HAVE_PCRE
+      case O_PCRE: *nn = pcrenode(p->a + 1); break;
+#endif
+      case O_MONO: *nn = mono(p->a + 1); break;
       default: die("syntax error near `%s': unexpected token", *p->a);
     }
     p_next(p);
@@ -338,7 +362,6 @@ static void p_term(p_ctx *p, node **nn)
 	p_next(p);
       default:
 	break;
-      case O_LPAREN:
       case O_RPAREN:
       case O_OR:
       case O_EOF:
@@ -387,6 +410,11 @@ static node *p_argv(int argc, const char *const argv[])
   ac = argc;
   ai = 1;
   p_next(&p);
+  if (p.t == O_EOF) {
+    usage(stderr);
+    pquis(stderr, "(Run `$ --help' for more detail.)\n");
+    exit(EXIT_FAILURE);
+  }
   p_expr(&p, &n);
   if (p.t != O_EOF) {
     die("syntax error near `%s': rubbish at end of line (too many `)'s?)",