From: Taylor R. Campbell <net/mumble/campbell>
Date: Thu, 18 Jan 2007 02:15:05 +0000 (+0000)
Subject: In DEFINE-STANDARD-KEYWORD, pass a list of fragments to
X-Git-Tag: 20090517-FFI~771
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d89189ffb8f4439f219021a7878a5851a7352c88;p=mit-scheme.git

In DEFINE-STANDARD-KEYWORD, pass a list of fragments to
DEFINE-KEYPARSER-PATTERN as one argument, not the fragments as
separate arguments.  This is supposed to be a `pattern' structure,
although it might be better to have an abstract MAKE-PATTERN
constructor or something instead of exposing the representation of
patterns as lists.
---

diff --git a/v7/src/edwin/verilog.scm b/v7/src/edwin/verilog.scm
index 47c277f7d..4cb8cb4ed 100644
--- a/v7/src/edwin/verilog.scm
+++ b/v7/src/edwin/verilog.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: verilog.scm,v 1.14 2007/01/05 21:19:24 cph Exp $
+$Id: verilog.scm,v 1.15 2007/01/18 02:15:05 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -182,27 +182,28 @@ USA.
 
 (define (define-standard-keyword keyword end parse-header)
   (define-keyparser-pattern keyword verilog-description
-    (make-keyparser-fragment 'KEYWORD
-			     keyword
-			     'PARSE-HEADER
-			     parse-header
-			     'INDENT-HEADER
-			     continued-header-indent
-			     'PARSE-BODY
-			     keyparse-forward
-			     'INDENT-BODY
-			     continued-statement-indent)
-    (and end
-	 (make-keyparser-fragment 'KEYWORD
-				  end
-				  'PARSE-HEADER
-				  parse-forward-noop
-				  'INDENT-HEADER
-				  continued-header-indent
-				  'PARSE-BODY
-				  #f
-				  'INDENT-BODY
-				  #f))))
+    (list
+     (make-keyparser-fragment 'KEYWORD
+			      keyword
+			      'PARSE-HEADER
+			      parse-header
+			      'INDENT-HEADER
+			      continued-header-indent
+			      'PARSE-BODY
+			      keyparse-forward
+			      'INDENT-BODY
+			      continued-statement-indent)
+     (and end
+	  (make-keyparser-fragment 'KEYWORD
+				   end
+				   'PARSE-HEADER
+				   parse-forward-noop
+				   'INDENT-HEADER
+				   continued-header-indent
+				   'PARSE-BODY
+				   #f
+				   'INDENT-BODY
+				   #f)))))
 
 (define-standard-keyword "always" #f
   parse-forward-noop)