Update Gerard Holzmann's Spin from version 6.1.0 (4 May 2011) to 6.2.4 (10 March 2013). The manual was not updated between these two versions. For information, here are the differences between the original version from Gerard Holzmann and this Plan 9 version of Spin. --- /sys/src/cmd/spin/main.c +++ /sys/src/cmd/spin/main.c @@ -104,7 +104,7 @@ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) #define CPP "cpp" #else - #define CPP "/lib/cpp" + #define CPP "/bin/cpp" #endif */ #endif @@ -554,7 +554,7 @@ void non_fatal(char *s1, char *s2) -{ extern int yychar; extern char yytext[]; +{ extern char yytext[]; printf("spin: %s:%d, Error: ", Fname?Fname->name:(oFname?oFname->name:"nofilename"), lineno); @@ -566,11 +566,6 @@ else printf(s1); #endif - if (yychar > 0) - { printf(" saw '"); - explain(yychar); - printf("'"); - } if (strlen(yytext)>1) printf(" near '%s'", yytext); printf("\n"); --- /sys/src/cmd/spin/pangen1.c +++ /sys/src/cmd/spin/pangen1.c @@ -16,11 +16,6 @@ #include "pangen3.h" #include "pangen6.h" #include -#ifdef SOLARIS -#include -#else -#include -#endif extern FILE *tc, *th, *tt; extern Label *labtab; @@ -155,9 +150,9 @@ i); fprintf(th, " unsigned _n : %d; /* active-claim index */\n", blog(nclaims)); - if (i <= UINT8_MAX) /* in stdint.h = UCHAR_MAX from limits.h */ + if (i <= 255) /* in stdint.h = UCHAR_MAX from limits.h */ { fprintf(th, " uchar c_cur[NCLAIMS]; /* claim-states */\n"); - } else if (i <= UINT16_MAX) /* really USHRT_MAX from limits.h */ + } else if (i <= 65535) /* really USHRT_MAX from limits.h */ { fprintf(th, " ushort c_cur[NCLAIMS]; /* claim-states */\n"); } else /* the most unlikely case */ { fprintf(th, " uint c_cur[NCLAIMS]; /* claim-states */\n"); --- /sys/src/cmd/spin/spin.h +++ /sys/src/cmd/spin/spin.h @@ -15,9 +15,6 @@ #include #include #include -#ifndef PC -#include -#endif enum { INIV, PUTV, LOGV }; /* for pangen[14].c */ enum btypes { NONE, N_CLAIM, I_PROC, A_PROC, P_PROC, E_TRACE, N_TRACE };