From 1072c7fba97490b495922aa73f9efd8514800da2 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 18 Dec 2016 22:16:14 +0100
Subject: [PATCH] nyacc: Support enhanced Guile-1.8.

* module/nyacc/lalr.scm: Export process-spec, reserved?.  Use optargs, syncase.
* module/nyacc/lex.scm: Use optargs, syncase.
* module/nyacc/parse.scm: Use optargs.
* module/nyacc/util.scm: Use optargs.
* module/nyacc/lang/util.scm: Use optargs.
* module/nyacc/lang/c99/cpp.scm: Use syncase.
* module/nyacc/lang/c99/parser.scm: Use optargs, syncase.
---
 module/nyacc/lalr.scm            | 4 ++++
 module/nyacc/lang/c99/cpp.scm    | 1 +
 module/nyacc/lang/c99/parser.scm | 2 ++
 module/nyacc/lang/util.scm       | 1 +
 module/nyacc/lex.scm             | 2 ++
 module/nyacc/parse.scm           | 1 +
 module/nyacc/util.scm            | 1 +
 7 files changed, 12 insertions(+)

diff --git a/module/nyacc/lalr.scm b/module/nyacc/lalr.scm
index 2bbb39a2..4cd57ed2 100644
--- a/module/nyacc/lalr.scm
+++ b/module/nyacc/lalr.scm
@@ -35,7 +35,11 @@
 	    looking-at first-item
 	    terminal? non-terminal?
 	    range-next
+            process-spec
+            reserved?
 	    )
+  #:use-module (ice-9 optargs)
+  #:use-module (ice-9 syncase)
   #:use-module ((srfi srfi-1) #:select (fold fold-right remove lset-union
 					     lset-intersection lset-difference))
   #:use-module ((srfi srfi-9) #:select (define-record-type))
diff --git a/module/nyacc/lang/c99/cpp.scm b/module/nyacc/lang/c99/cpp.scm
index a00eec3e..f232e902 100644
--- a/module/nyacc/lang/c99/cpp.scm
+++ b/module/nyacc/lang/c99/cpp.scm
@@ -25,6 +25,7 @@
 	    cpp-expand-text
 	    expand-cpp-mref
 	    )
+  #:use-module (ice-9 syncase)
   #:use-module (nyacc parse)
   #:use-module (nyacc lex)
   #:use-module (nyacc lang util)
diff --git a/module/nyacc/lang/c99/parser.scm b/module/nyacc/lang/c99/parser.scm
index 71c54865..10643094 100644
--- a/module/nyacc/lang/c99/parser.scm
+++ b/module/nyacc/lang/c99/parser.scm
@@ -19,6 +19,8 @@
 
 (define-module (nyacc lang c99 parser)
   #:export (parse-c parse-c99 def-xdef? std-dict)
+  #:use-module (ice-9 optargs)
+  #:use-module (ice-9 syncase)
   #:use-module (nyacc lex)
   #:use-module (nyacc parse)
   #:use-module (nyacc lang util)
diff --git a/module/nyacc/lang/util.scm b/module/nyacc/lang/util.scm
index e0405fb1..d30e1758 100644
--- a/module/nyacc/lang/util.scm
+++ b/module/nyacc/lang/util.scm
@@ -21,6 +21,7 @@
 	    ;; for ???
 	    move-if-changed
             fmterr)
+  #:use-module (ice-9 optargs)
   #:use-module ((srfi srfi-1) #:select(find))
   )
 
diff --git a/module/nyacc/lex.scm b/module/nyacc/lex.scm
index 7820f668..4728b487 100644
--- a/module/nyacc/lex.scm
+++ b/module/nyacc/lex.scm
@@ -49,6 +49,8 @@
 	    like-c-ident?
 	    filter-mt remove-mt map-mt make-ident-like-p 
 	    c:ws c:if c:ir)
+  #:use-module (ice-9 optargs)
+  #:use-module (ice-9 syncase)
   #:use-module ((srfi srfi-1) #:select (remove append-reverse))
   #:use-module (ice-9 pretty-print)
   )
diff --git a/module/nyacc/parse.scm b/module/nyacc/parse.scm
index 54f92837..5609be91 100644
--- a/module/nyacc/parse.scm
+++ b/module/nyacc/parse.scm
@@ -23,6 +23,7 @@
   #:export (make-lalr-parser
 	    make-lalr-ia-parser
 	    )
+  #:use-module (ice-9 optargs)
   #:use-module (nyacc util)
   #:use-module ((srfi srfi-43) #:select (vector-map vector-for-each))
   )
diff --git a/module/nyacc/util.scm b/module/nyacc/util.scm
index d8f88a0f..49316e27 100644
--- a/module/nyacc/util.scm
+++ b/module/nyacc/util.scm
@@ -28,6 +28,7 @@
 	    ugly-print
 	    tzort
 	    )
+  #:use-module (ice-9 optargs)
   #:use-module ((srfi srfi-43) #:select (vector-fold))
   )