- added tokens "read" and "write" (in preparation for archiving)

diff --git a/ginsh/Makefile.in b/ginsh/Makefile.in
index 342ed4627716727b87f22f1cc5189715d2f8a0eb..977284b47d43bc0901920b4beb795be954c6114a 100644 (file)
--- a/ginsh/Makefile.in
+++ b/ginsh/Makefile.in
@@ -59,6 +59,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@

+ARCHIVE_AGE = @ARCHIVE_AGE@
+ARCHIVE_VERSION = @ARCHIVE_VERSION@

 AS = @AS@
 CC = @CC@
 CXX = @CXX@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@


@@ -309,7 +311,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pr $$/$$file $(distdir)/$$file; \

          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

diff --git a/ginsh/ginsh_lexer.ll b/ginsh/ginsh_lexer.ll
index 314db61307e7a6356899b073e1dc4cdb18cf9f4b..2d925b58d121b9df88e2366285b412870e915246 100644 (file)
--- a/ginsh/ginsh_lexer.ll
+++ b/ginsh/ginsh_lexer.ll
@@ -68,6 +68,8 @@ Digits                        yylval = (long)Digits; return T_DIGITS;
                        /* keywords */
 quit|exit              return T_QUIT;
 print                  return T_PRINT;
                        /* keywords */
 quit|exit              return T_QUIT;
 print                  return T_PRINT;

+read                   return T_READ;
+write                  return T_WRITE;

 time                   return T_TIME;
 xyzzy                  return T_XYZZY;
 inventory              return T_INVENTORY;
 time                   return T_TIME;
 xyzzy                  return T_XYZZY;
 inventory              return T_INVENTORY;

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 375290f93d9883028686a14b882b1ad0cf39775f..cbb8be21e543640218719c663ee82c5684c9c534 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -86,7 +86,7 @@ static ex lst2matrix(const ex &l);
 %token T_NUMBER T_SYMBOL T_LITERAL T_DIGITS T_QUOTE T_QUOTE2 T_QUOTE3
 %token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ T_MATRIX_BEGIN T_MATRIX_END
 
 %token T_NUMBER T_SYMBOL T_LITERAL T_DIGITS T_QUOTE T_QUOTE2 T_QUOTE3
 %token T_EQUAL T_NOTEQ T_LESSEQ T_GREATEREQ T_MATRIX_BEGIN T_MATRIX_END
 

-%token T_QUIT T_PRINT T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE
+%token T_QUIT T_PRINT T_READ T_WRITE T_TIME T_XYZZY T_INVENTORY T_LOOK T_SCORE

 
 /* Operator precedence and associativity */
 %right '='
 
 /* Operator precedence and associativity */
 %right '='