[Wisp-cvs] wisp/src GenWisp.pm,1.18,1.19 wordlist.txt,1.561,1.562

[<di...@us...>]

Update of /cvsroot/wisp/wisp/src
In directory usw-pr-cvs1:/tmp/cvs-serv3308/src

Modified Files:
	GenWisp.pm wordlist.txt 
Log Message:
Shortened the format of wordlist.txt .

Index: GenWisp.pm
===================================================================
RCS file: /cvsroot/wisp/wisp/src/GenWisp.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- GenWisp.pm	22 Jul 2002 14:53:09 -0000	1.18
+++ GenWisp.pm	7 Sep 2002 21:50:43 -0000	1.19
@@ -60,22 +60,13 @@
     return $_;
 }
 
-sub trim
-{
-    local ($_) = @_ if @_;
-    chomp;
-    s/\s*#.*$//; s/\s*$//; s/^\s*//;
-    return $_;
-}
-
 sub wordlist
 {
     my %res;
     local *WORDS;
     open WORDS, 'wordlist.txt' or die "can't open wordlist.txt: $!\n";
-    while (<WORDS>)
+    for (map {split /\s+/} grep /^[^#]/, <WORDS>)
       {
-        next unless trim; # for empty lines; `0' is not a proper word as well
         die "Duplicate word $_ at wordlist.txt:$.\n" if $res{$_};
         $res{$_} = wordify $_;
       }

Index: wordlist.txt
===================================================================
RCS file: /cvsroot/wisp/wisp/src/wordlist.txt,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -d -r1.561 -r1.562
--- wordlist.txt	7 Sep 2002 21:50:35 -0000	1.561
+++ wordlist.txt	7 Sep 2002 21:50:43 -0000	1.562
@@ -6,1245 +6,181 @@
 #
 #### @(#) $Id$
 
-!
-$
-$?
-%fd->port
-%get-module
-*
-*arglist*
-*asm-lock*
[...1392 lines suppressed...]
+sys:getpgrp sys:getpid sys:getppid sys:getuid sys:kill sys:link
+sys:listen sys:lseek sys:lstat sys:mkdir sys:nanosleep sys:open
+sys:pipe sys:read sys:rename sys:select sys:setpgid sys:setpgrp
+sys:setsid sys:stat sys:symlink sys:sync sys:tcgetattr sys:tcsetattr
+sys:truncate sys:unlink sys:waitpid sys:write syscalls sysnr
+system-constant system-constant-internal system-constants system-error
+system-path system-type t t* tab takervec target tc tcchangeattr
+tcgetattr tcgetattr-raw tcsetattr-raw tenth termios th third time tn
+too-long-character topocopy toposplit translate tree-copy true truncate
+truncate-not try tty? type type-of ubyte? uid undefined unix-time
+unknown unknown-context unknown-local unknown-open-input-file-flag
+unknown-open-output-file-flag unlink unpack-be-integer
+unpack-le-integer unpack-struct-flock unquote unquote-splicing
+unreadable unreadable-port unseekable-port unsure-collect
+unwritable-port use utf-8->c16string utf-8-continuer?
+utf-8-first-byte->length uwyde? val valloc value vector vector->list
+vector-append vector-copy vector-fill! vector-length vector-move!
+vector-ref vector? void void? vs vtab waitpid while wisp-build
+wisp-builder wisp-string-hash wisp-version with-fluid write write-char
+write-string writeln wrong-fluid x xors xri zero?