From 3f145044e3eb035128db9764e4fdaf96cfd67577 Mon Sep 17 00:00:00 2001 From: Utz-Uwe Haus Date: Wed, 1 Oct 2008 19:05:10 +0200 Subject: [PATCH] Update licensing information. Signed-off-by: Utz-Uwe Haus --- .gitattributes | 4 ++++ README | 14 ++++++++++++++ bootstrap.lisp | 14 ++++++++------ entrypoints.lisp | 14 ++++++++------ opossum.asd | 12 ++++++------ opossum.peg | 25 +++++++++++++++++++++++-- package.lisp | 10 +++++----- peg-mode.el | 5 +---- pegutils.lisp | 11 ++++++----- 9 files changed, 75 insertions(+), 34 deletions(-) create mode 100644 .gitattributes create mode 100644 README diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..7b529cc --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +*.lisp ident +*.asd ident +*.peg ident +README ident diff --git a/README b/README new file mode 100644 index 0000000..99c4c10 --- /dev/null +++ b/README @@ -0,0 +1,14 @@ +cl-opossum +---------- + +CL-Opossum is a Packrat-style parser generator for Parsing Expression Grammars. +It can bootstrap itself (using pegparser-boot.lisp to parse opossum.peg), +but was written mainly as a general-purpose tool for lispers to quickly +write reasonably efficent parsers in lisp, without the hassle of separating +lexial and syntactic analysis. + +The code was inspired (and initially bootstrapped) by John Leuner's +experimental metapeg library, but does not share significant code with it. + +$Id$ + diff --git a/bootstrap.lisp b/bootstrap.lisp index 8411017..b2d62ee 100644 --- a/bootstrap.lisp +++ b/bootstrap.lisp @@ -4,26 +4,28 @@ ;; Copyright (C) 2008 Utz-Uwe Haus ;; $Id$ +;; ;; This code is free software; you can redistribute it and/or modify -;; it under the terms of the version 3 of the GNU General +;; it under the terms of the version 2.1 of the GNU Lesser General ;; Public License as published by the Free Software Foundation, as -;; clarified by the prequel found in LICENSE.Lisp-GPL-Preface. +;; clarified by the lisp prequel found in LICENSE. ;; ;; This code is distributed in the hope that it will be useful, but ;; without any warranty; without even the implied warranty of ;; merchantability or fitness for a particular purpose. See the GNU ;; Lesser General Public License for more details. ;; -;; Version 3 of the GNU General Public License is in the file -;; LICENSE.GPL that was distributed with this file. If it is not +;; Version 2.1 of the GNU Lesser General Public License is in the file +;; LICENSE that was distributed with this file. If it is not ;; present, you can access it from -;; http://www.gnu.org/copyleft/gpl.txt (until superseded by a +;; http://www.gnu.org/copyleft/lgpl.txt (until superseded by a ;; newer version) or write to the Free Software Foundation, Inc., 59 ;; Temple Place, Suite 330, Boston, MA 02111-1307 USA ;; ;; Commentary: -;; +;; This file is loaded to bootstrap ourselves: it generates pegparser.lisp +;; from opossum.peg using pegparser-boot.lisp. ;;; Code: diff --git a/entrypoints.lisp b/entrypoints.lisp index 5e3a979..a270d0e 100644 --- a/entrypoints.lisp +++ b/entrypoints.lisp @@ -4,26 +4,28 @@ ;; Copyright (C) 2008 Utz-Uwe Haus ;; $Id$ +;; ;; This code is free software; you can redistribute it and/or modify -;; it under the terms of the version 3 of the GNU General +;; it under the terms of the version 2.1 of the GNU Lesser General ;; Public License as published by the Free Software Foundation, as -;; clarified by the prequel found in LICENSE.Lisp-GPL-Preface. +;; clarified by the lisp prequel found in LICENSE. ;; ;; This code is distributed in the hope that it will be useful, but ;; without any warranty; without even the implied warranty of ;; merchantability or fitness for a particular purpose. See the GNU ;; Lesser General Public License for more details. ;; -;; Version 3 of the GNU General Public License is in the file -;; LICENSE.GPL that was distributed with this file. If it is not +;; Version 2.1 of the GNU General Public License is in the file +;; LICENSE that was distributed with this file. If it is not ;; present, you can access it from -;; http://www.gnu.org/copyleft/gpl.txt (until superseded by a +;; http://www.gnu.org/copyleft/lgpl.txt (until superseded by a ;; newer version) or write to the Free Software Foundation, Inc., 59 ;; Temple Place, Suite 330, Boston, MA 02111-1307 USA ;; ;; Commentary: -;; +;; This file contains code for the opossum package that depends on +;; the parser part already being compiled to avoid undefined symbol warnings ;;; Code: diff --git a/opossum.asd b/opossum.asd index 4750735..1cb1044 100644 --- a/opossum.asd +++ b/opossum.asd @@ -7,25 +7,25 @@ ;; $Id$ ;; ;; This code is free software; you can redistribute it and/or modify -;; it under the terms of the version 3 of the GNU General +;; it under the terms of the version 2.1 of the GNU Lesser General ;; Public License as published by the Free Software Foundation, as -;; clarified by the prequel found in LICENSE.Lisp-GPL-Preface. +;; clarified by the lisp prequel found in LICENSE. ;; ;; This code is distributed in the hope that it will be useful, but ;; without any warranty; without even the implied warranty of ;; merchantability or fitness for a particular purpose. See the GNU ;; Lesser General Public License for more details. ;; -;; Version 3 of the GNU General Public License is in the file -;; LICENSE.GPL that was distributed with this file. If it is not +;; Version 2.1 of the GNU General Public License is in the file +;; LICENSE that was distributed with this file. If it is not ;; present, you can access it from -;; http://www.gnu.org/copyleft/gpl.txt (until superseded by a +;; http://www.gnu.org/copyleft/lgpl.txt (until superseded by a ;; newer version) or write to the Free Software Foundation, Inc., 59 ;; Temple Place, Suite 330, Boston, MA 02111-1307 USA ;; ;; Commentary: -;; +;; ASDF definitions for the opossum system, including bootstrapping logic. ;;; Code: diff --git a/opossum.peg b/opossum.peg index aa67aa0..d07760b 100644 --- a/opossum.peg +++ b/opossum.peg @@ -1,13 +1,34 @@ ## -*- mode: peg -*- +## (c) 2008 Utz-Uwe Haus ## $Id$ +## +## This code is free software; you can redistribute it and/or modify +## it under the terms of the version 2.1 of the GNU Lesser General +## Public License as published by the Free Software Foundation, as +## clarified by the lisp prequel found in LICENSE. +## +## This code is distributed in the hope that it will be useful, but +## without any warranty; without even the implied warranty of +## merchantability or fitness for a particular purpose. See the GNU +## Lesser General Public License for more details. +## +## Version 2.1 of the GNU Lesser General Public License is in the file +## LICENSE that was distributed with this file. If it is not +## present, you can access it from +## http://www.gnu.org/copyleft/lgpl.txt (until superseded by a +## newer version) or write to the Free Software Foundation, Inc., 59 +## Temple Place, Suite 330, Boston, MA 02111-1307 USA +## +## Commentary: +## ## PEG syntax in PEG as in the original report # -# Process this file with an existing peg parser to bootstrap. +# Process this file with an existing PEG parser to bootstrap. # The output needs to be adjusted by replacing the package OPOSSUM # by OPOSSUM-SYSTEM if you want to use it as a replacement of # the shipped pegparser-boot.lisp # -# This fie needs a cleanup wrt. linebreaks once we bootstrapped off +# This file needs a cleanup wrt. linebreaks once we bootstrapped off # the metapeg parser which is crippled. # # Hierarchical syntax diff --git a/package.lisp b/package.lisp index d168e1e..6d4da94 100644 --- a/package.lisp +++ b/package.lisp @@ -7,19 +7,19 @@ ;; $Id$ ;; ;; This code is free software; you can redistribute it and/or modify -;; it under the terms of the version 3 of the GNU General +;; it under the terms of the version 2.1 of the GNU Lesser General ;; Public License as published by the Free Software Foundation, as -;; clarified by the prequel found in LICENSE.Lisp-GPL-Preface. +;; clarified by the lisp prequel found in LICENSE. ;; ;; This code is distributed in the hope that it will be useful, but ;; without any warranty; without even the implied warranty of ;; merchantability or fitness for a particular purpose. See the GNU ;; Lesser General Public License for more details. ;; -;; Version 3 of the GNU General Public License is in the file -;; LICENSE.GPL that was distributed with this file. If it is not +;; Version 2.1 of the GNU Lesser General Public License is in the file +;; LICENSE that was distributed with this file. If it is not ;; present, you can access it from -;; http://www.gnu.org/copyleft/gpl.txt (until superseded by a +;; http://www.gnu.org/copyleft/lgpl.txt (until superseded by a ;; newer version) or write to the Free Software Foundation, Inc., 59 ;; Temple Place, Suite 330, Boston, MA 02111-1307 USA ;; diff --git a/peg-mode.el b/peg-mode.el index 5dcf8f8..2a9c01c 100644 --- a/peg-mode.el +++ b/peg-mode.el @@ -1,9 +1,6 @@ ;;; peg-mode.el --- emacs mode for editing PEG grammar files -;; Copyright (C) 2008 Free Software Foundation, Inc. - -;; Author: Utz-Uwe Haus -;; Keywords: data +;; Copyright (C) 2008 Utz-Uwe Haus ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/pegutils.lisp b/pegutils.lisp index 1df501d..5a06305 100644 --- a/pegutils.lisp +++ b/pegutils.lisp @@ -4,20 +4,21 @@ ;; Copyright (C) 2008 Utz-Uwe Haus ;; $Id$ +;; ;; This code is free software; you can redistribute it and/or modify -;; it under the terms of the version 3 of the GNU General +;; it under the terms of the version 2.1 of the GNU Lesser General ;; Public License as published by the Free Software Foundation, as -;; clarified by the prequel found in LICENSE.Lisp-GPL-Preface. +;; clarified by the lisp prequel found in LICENSE. ;; ;; This code is distributed in the hope that it will be useful, but ;; without any warranty; without even the implied warranty of ;; merchantability or fitness for a particular purpose. See the GNU ;; Lesser General Public License for more details. ;; -;; Version 3 of the GNU General Public License is in the file -;; LICENSE.GPL that was distributed with this file. If it is not +;; Version 2.1 of the GNU Lesser General Public License is in the file +;; LICENSE that was distributed with this file. If it is not ;; present, you can access it from -;; http://www.gnu.org/copyleft/gpl.txt (until superseded by a +;; http://www.gnu.org/copyleft/lgpl.txt (until superseded by a ;; newer version) or write to the Free Software Foundation, Inc., 59 ;; Temple Place, Suite 330, Boston, MA 02111-1307 USA ;; -- 2.11.4.GIT