gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, feature/cpp-compile, updated. gawk-4.1.0-6052-g588824


From: Arnold Robbins
Subject: [SCM] gawk branch, feature/cpp-compile, updated. gawk-4.1.0-6052-g5888240d
Date: Fri, 9 Aug 2024 01:54:34 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, feature/cpp-compile has been updated
       via  5888240dec568c10add09d6335c3300a81f558fa (commit)
       via  b38c8f9763b8cd7baa1a13d295d02e4c0c4f2043 (commit)
       via  45d280bb98565805080894e5e932620ff382b45f (commit)
       via  a3e5397339245d0637304647081ef6b2c1bb343c (commit)
      from  c1f84126e8e978c7cb5e689d8ef152c73719eb18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=5888240dec568c10add09d6335c3300a81f558fa

commit 5888240dec568c10add09d6335c3300a81f558fa
Merge: c1f84126 b38c8f97
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Fri Aug 9 08:54:21 2024 +0300

    Merge branch 'master' into feature/cpp-compile

diff --cc awk.h
index 5ab1bda4,28f80cb4..b926eda8
--- a/awk.h
+++ b/awk.h
@@@ -1031,13 -1015,6 +1031,14 @@@ enum binmode_values 
  /*
   * structure for our source, either a command line string or a source file.
   */
 +enum srctype {
 +      SRC_CMDLINE = 1,
 +      SRC_STDIN,
 +      SRC_FILE,
 +      SRC_INC,
++      SRC_NSINC,
 +      SRC_EXTLIB
 +};
  
  typedef struct srcfile {
        struct srcfile *next;
diff --cc awkgram.c
index 6fb0494c,275a422c..dc12bb6e
--- a/awkgram.c
+++ b/awkgram.c
@@@ -233,9 -233,11 +235,9 @@@ static inline INSTRUCTION *list_append(
  static inline INSTRUCTION *list_prepend(INSTRUCTION *l, INSTRUCTION *x);
  static inline INSTRUCTION *list_merge(INSTRUCTION *l1, INSTRUCTION *l2);
  
 -extern double fmod(double x, double y);
 -
  #define YYSTYPE INSTRUCTION *
  
- #line 239 "awkgram.c"
+ #line 241 "awkgram.c"
  
  # ifndef YY_CAST
  #  ifdef __cplusplus
@@@ -6865,9 -6892,10 +6892,10 @@@ retry
        /* See if it is a special token. */
        if ((mid = check_qualified_special(tokstart)) >= 0) {
                static int warntab[sizeof(tokentab) / sizeof(tokentab[0])];
 -              int class = tokentab[mid].class;
 +              int lex_class = tokentab[mid].lex_class;
  
 -              switch (class) {
 +              switch (lex_class) {
+               case LEX_NSINCLUDE:
                case LEX_EVAL:
                case LEX_INCLUDE:
                case LEX_LOAD:
@@@ -6930,7 -6958,10 +6958,10 @@@
                if ((tokentab[mid].flags & CONTINUE) != 0)
                        continue_allowed++;
  
 -              switch (class) {
 +              switch (lex_class) {
+               case LEX_NSINCLUDE:
+                       include_use_current_namespace = true;
+                       goto make_at_token;     // can't fall through
                case LEX_NAMESPACE:
                        want_namespace = true;
                        // fall through
diff --cc awkgram.y
index b41dacef,0e7e8f58..ef4b8a42
--- a/awkgram.y
+++ b/awkgram.y
@@@ -4363,9 -4382,10 +4382,10 @@@ retry
        /* See if it is a special token. */
        if ((mid = check_qualified_special(tokstart)) >= 0) {
                static int warntab[sizeof(tokentab) / sizeof(tokentab[0])];
 -              int class = tokentab[mid].class;
 +              int lex_class = tokentab[mid].lex_class;
  
 -              switch (class) {
 +              switch (lex_class) {
+               case LEX_NSINCLUDE:
                case LEX_EVAL:
                case LEX_INCLUDE:
                case LEX_LOAD:
@@@ -4428,7 -4448,10 +4448,10 @@@
                if ((tokentab[mid].flags & CONTINUE) != 0)
                        continue_allowed++;
  
 -              switch (class) {
 +              switch (lex_class) {
+               case LEX_NSINCLUDE:
+                       include_use_current_namespace = true;
+                       goto make_at_token;     // can't fall through
                case LEX_NAMESPACE:
                        want_namespace = true;
                        // fall through

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |   43 ++
 NEWS           |    7 +
 awk.h          |    1 +
 awkgram.c      | 2294 ++++++++++++++++++++++++++++----------------------------
 awkgram.y      |   38 +-
 command.c      |    2 +-
 command.y      |    2 +-
 debug.c        |    9 +-
 doc/ChangeLog  |    4 +
 doc/awkcard.in |   28 +-
 doc/gawk.1     |   17 +-
 doc/gawk.info  | 1381 ++++++++++++++++++----------------
 doc/gawk.texi  |  121 ++-
 eval.c         |    7 +-
 io.c           |    2 +-
 main.c         |    2 +-
 printf.c       |    2 +-
 profile.c      |    4 +-
 18 files changed, 2161 insertions(+), 1803 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]