From c259afbe6120c83c41736bcd1c5fb6f3403bc246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@gmail.com>
Date: Thu, 26 Jan 2017 17:50:10 +0100
Subject: [PATCH] Removed parse/private/keywords.rkt, to improve compatibility
 with the official syntax/parse (that file defines ~optional etc.)

---
 info.rkt                       |  3 ++-
 parse/experimental/eh.rkt      |  2 +-
 parse/experimental/reflect.rkt |  2 +-
 parse/private/keywords.rkt     | 40 ----------------------------------
 parse/private/lib.rkt          |  2 +-
 parse/private/parse.rkt        |  2 +-
 parse/private/rep.rkt          |  2 +-
 parse/private/sc.rkt           |  4 ++--
 8 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 parse/private/keywords.rkt

diff --git a/info.rkt b/info.rkt
index 327202c..dcac673 100644
--- a/info.rkt
+++ b/info.rkt
@@ -3,7 +3,8 @@
 (define deps '(("base" #:version "6.7.0.900")
                "rackunit-lib"
                ;; Because scribble/example is not available on v6.3:
-               "version-case"))
+               "version-case"
+               "subtemplate")) ;; for the documentation only
 (define build-deps '("scribble-lib" "racket-doc"))
 (define scribblings '(("scribblings/stxparse-info.scrbl" ())))
 (define pkg-desc "Description Here")
diff --git a/parse/experimental/eh.rkt b/parse/experimental/eh.rkt
index 3050807..f8e1b09 100644
--- a/parse/experimental/eh.rkt
+++ b/parse/experimental/eh.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
 (require "../private/sc.rkt"
-         "../private/keywords.rkt")
+         syntax/parse/private/keywords)
 (provide ~eh-var
          define-eh-alternative-set)
diff --git a/parse/experimental/reflect.rkt b/parse/experimental/reflect.rkt
index e8aca36..460d964 100644
--- a/parse/experimental/reflect.rkt
+++ b/parse/experimental/reflect.rkt
@@ -6,7 +6,7 @@
          racket/contract/base
          racket/contract/combinator
          syntax/parse/private/minimatch
-         "../private/keywords.rkt"
+         syntax/parse/private/keywords
          "../private/runtime-reflect.rkt"
          syntax/parse/private/kws)
 (begin-for-syntax
diff --git a/parse/private/keywords.rkt b/parse/private/keywords.rkt
deleted file mode 100644
index fb52ebc..0000000
--- a/parse/private/keywords.rkt
+++ /dev/null
@@ -1,40 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-;; == Keywords
-
-(define-for-syntax (bad-keyword-use stx)
-  (raise-syntax-error #f "keyword used out of context" stx))
-
-(define-syntax-rule (define-keyword name)
-  (begin
-    (provide name)
-    (define-syntax name bad-keyword-use)))
-
-(define-keyword pattern)
-(define-keyword ~var)
-(define-keyword ~datum)
-(define-keyword ~literal)
-(define-keyword ~and)
-(define-keyword ~or)
-(define-keyword ~not)
-(define-keyword ~seq)
-(define-keyword ~between)
-(define-keyword ~once)
-(define-keyword ~optional)
-(define-keyword ~rest)
-(define-keyword ~describe)
-(define-keyword ~!)
-(define-keyword ~bind)
-(define-keyword ~fail)
-(define-keyword ~parse)
-(define-keyword ~do)
-(define-keyword ...+)
-(define-keyword ~delimit-cut)
-(define-keyword ~commit)
-(define-keyword ~reflect)
-(define-keyword ~splicing-reflect)
-(define-keyword ~post)
-(define-keyword ~eh-var)
-(define-keyword ~peek)
-(define-keyword ~peek-not)
diff --git a/parse/private/lib.rkt b/parse/private/lib.rkt
index f330be9..647e201 100644
--- a/parse/private/lib.rkt
+++ b/parse/private/lib.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require "sc.rkt"
-         "keywords.rkt"
+         syntax/parse/private/keywords
          (for-syntax racket/base))
 
 (provide identifier
diff --git a/parse/private/parse.rkt b/parse/private/parse.rkt
index 02a8528..9e1652c 100644
--- a/parse/private/parse.rkt
+++ b/parse/private/parse.rkt
@@ -12,7 +12,7 @@
                      syntax/parse/private/kws
                      "opt.rkt"
                      "txlift.rkt")
-         "keywords.rkt"
+         syntax/parse/private/keywords
          racket/syntax
          racket/stxparam
          syntax/stx
diff --git a/parse/private/rep.rkt b/parse/private/rep.rkt
index 0594cad..9327159 100644
--- a/parse/private/rep.rkt
+++ b/parse/private/rep.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-template racket/base
-                       stxparse-info/parse/private/keywords
+                       syntax/parse/private/keywords
                        stxparse-info/parse/private/residual ;; keep abs. path
                        stxparse-info/parse/private/runtime)
          racket/list
diff --git a/parse/private/sc.rkt b/parse/private/sc.rkt
index a15968f..dc6bdda 100644
--- a/parse/private/sc.rkt
+++ b/parse/private/sc.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require (for-syntax racket/base
                      racket/lazy-require)
-         "keywords.rkt")
+         syntax/parse/private/keywords)
 
 ;; keep and keep as abs. path -- lazy-loaded macros produce references to this
 ;; must be required via *absolute module path* from any disappearing module
@@ -38,7 +38,7 @@
          syntax-parser
          define/syntax-parse
 
-         (except-out (all-from-out "keywords.rkt")
+         (except-out (all-from-out syntax/parse/private/keywords)
                      ~reflect
                      ~splicing-reflect
                      ~eh-var)