diff --git a/.bzrignore b/.bzrignore
index c5e98c895f1f5877b991868f9baba9960423cfbb..bf1e44b5d64a1439b5f2bd5b89b1dd95f4506a5f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -21,3 +21,4 @@ RoSta/GeneratedAspects.jrag
RoSta/Parser.java
RoSta/RoSta.ast
owl-s
+GenCompiler.jar
diff --git a/CompilerGeneration.jrag b/CompilerGeneration.jrag
index e486e29a08cf43841f9c0abff30fe8a92bc21936..5caa9ac34b5d8be51a74002869fd7d73bf49e8ba 100644
--- a/CompilerGeneration.jrag
+++ b/CompilerGeneration.jrag
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
import java.io.*;
diff --git a/DumpClasses.java b/DumpClasses.java
index c567efdc6acf933ba15474425bfa23543e1bb40f..89f3f13d6bc75fd2299eb85bb01f32f7bf1c42c5 100644
--- a/DumpClasses.java
+++ b/DumpClasses.java
@@ -1,9 +1,22 @@
// package programs;
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
import AST.Start;
diff --git a/DumpClasses.jrag b/DumpClasses.jrag
index 8cc2d12332ec23198ce62fa25ab2c3884b17e45e..76a47658d63057e6813e4bab00ef972f0a60b77c 100644
--- a/DumpClasses.jrag
+++ b/DumpClasses.jrag
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
import java.io.PrintStream;
diff --git a/Dumper.java b/Dumper.java
index 52ee591e8b5e300e831d194d717ccd822747a4da..3f3471ccb406e68be9e4f412ff65e04783f22853 100644
--- a/Dumper.java
+++ b/Dumper.java
@@ -1,7 +1,20 @@
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/GenCompiler.java b/GenCompiler.java
index a54b665389c9abb0a46ff8f66c6c3f1b69992a60..0a53d87bb23c7620112bb0ed0109a1fa9e003739 100644
--- a/GenCompiler.java
+++ b/GenCompiler.java
@@ -1,9 +1,22 @@
// package programs;
/*
- * Copyright (C) 2006-2008 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
import AST.Start;
diff --git a/JavaCCChunks.jrag b/JavaCCChunks.jrag
index 0d0882bd67dafd4e93e69309bc6d3250bd4f9964..2c4e609265877f1b0009321ca91947e131fce2ba 100644
--- a/JavaCCChunks.jrag
+++ b/JavaCCChunks.jrag
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
aspect JavaCCChunks {
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..85b8e59922af06a29135a36d55993b6509e700a2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,620 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
diff --git a/Misc.jrag b/Misc.jrag
index 74f389cc26ae090f577be5f859c37af07b3f3d53..d4775d6f183005e4177395bda7e252c8ce2923fc 100644
--- a/Misc.jrag
+++ b/Misc.jrag
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/Names.jrag b/Names.jrag
index f59d1f3071ad613f118637ee7a6270d0bba97caf..ec7fcc8af7f4f3df5aefa56e621878f607aeea8d 100644
--- a/Names.jrag
+++ b/Names.jrag
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
aspect Names {
diff --git a/Parser.java b/Parser.java
index 3da6da64eb037168c2590d2bd49e549124ac40b9..029bbf11c9b764b2e425608dac717403b74dbf5f 100644
--- a/Parser.java
+++ b/Parser.java
@@ -1,8 +1,21 @@
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
import java.io.FileNotFoundException;
diff --git a/Rewrites.jrag b/Rewrites.jrag
index 50b826032d172bf2e130687b3719d9607a6f6302..9dc1f0df7f5b2238e5a23bd33cc55f9d87d5f1e7 100644
--- a/Rewrites.jrag
+++ b/Rewrites.jrag
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
aspect MiscUtilities {
diff --git a/Types.jrag b/Types.jrag
index 8201e00135148406f9c37f7109d126c573da24b8..e6e457a369250e84dfdb53908b9b6cec715f30e2 100644
--- a/Types.jrag
+++ b/Types.jrag
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006-2008 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
import java.util.ArrayList;
diff --git a/build.xml b/build.xml
index fe6d0b3174af7fca298a0afa0db2c9ea3ea1ad82..5666f3a84f6a5d2679b9717fc998f87036436b58 100644
--- a/build.xml
+++ b/build.xml
@@ -1,3 +1,22 @@
+<!--
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
+ *
+ * This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
+ *-->
+
<!--
Targets for working from terminal window:
build (default) - generates java files and compiles them
@@ -98,9 +117,9 @@
</target>
<target name="jar" depends="build">
- <jar destfile="PrettyPrint.jar" basedir="." includes="**/*.class" excludes="test/**">
+ <jar destfile="GenCompiler.jar" basedir="." includes="**/*.class" excludes="test/**">
<manifest>
- <attribute name="Main-Class" value="JavaPrettyPrinter"/>
+ <attribute name="Main-Class" value="GenCompiler"/>
</manifest>
</jar>
</target>
diff --git a/owl.ast b/owl.ast
index 7106e6205194c19e29032f1a36c1858f2d30cc11..576ff58b05dc1550be55cb9761a2d36a85aae52c 100644
--- a/owl.ast
+++ b/owl.ast
@@ -1,19 +1,57 @@
// -*-Java-*-
-// Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+// Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
//
// This file is part of OntologyCompiler.
+//
+// OntologyCompiler is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// OntologyCompiler 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
Start ::= Specification;
-Specification ::= XmlHeader RdfDeclaration;
+Specification ::= XmlHeader OntoDeclaration;
XmlHeader ::= Attribute*;
abstract Element;
abstract ComplexElement : Element ::= Attribute* Element*;
+
+OntoDeclaration : ComplexElement;
+
+// New ontology format elements
+Annotation : ComplexElement;
+AnnotationProperty : ComplexElement;
+Clazz : ComplexElement;
+ClassAssertion : ComplexElement;
+DataProperty : ComplexElement;
+DataPropertyDomain : ComplexElement;
+DataPropertyRange : ComplexElement;
+Datatype : ComplexElement;
+Declaration : ComplexElement;
+Literal : ComplexElement;
+NamedIndividual : ComplexElement;
+ObjectExactCardinality : ComplexElement;
+ObjectMinCardinality : ComplexElement;
+ObjectSomeValuesFrom : ComplexElement;
+ObjectProperty : ComplexElement;
+ObjectPropertyAssertion : ComplexElement;
+ObjectPropertyDomain : ComplexElement;
+Ontology : OntoDeclaration;
+Prefix : ComplexElement;
+SubClassOf : ComplexElement;
+
+// Compatibility with old format below
ListFirst : ComplexElement;
ListRest : ComplexElement;
ExprKIFCondition : ComplexElement;
@@ -22,7 +60,7 @@ ExpressionCondition : ComplexElement;
ExpressionLogicLanguage : ComplexElement;
ExpressionRefURI : ComplexElement;
ObjectListList : ComplexElement;
-RdfDeclaration : ComplexElement;
+RdfDeclaration : OntoDeclaration;
RdfDescription : ComplexElement;
RdfFirst : ComplexElement;
RdfProperty : ComplexElement;
@@ -90,6 +128,16 @@ IntElement : SimpleElement ::= <LITERAL>;
FloatElement : SimpleElement ::= <LITERAL>;
abstract Attribute ::= Value;
+
+// New ontology format attributes
+AbbreviatedIRI : Attribute;
+Cardinality : Attribute;
+DatatypeIRI : Attribute;
+OntologyIRI : Attribute;
+IRI : Attribute;
+Name : Attribute;
+
+
Version : Attribute;
RdfAbout : Attribute;
RdfDatatype : Attribute;
@@ -98,6 +146,7 @@ RdfParseType : Attribute;
RdfResource : Attribute;
XmlBase : Attribute;
Xmlns : Attribute;
+XmlnsXml : Attribute;
XmlnsXX : Attribute ::= <IDENTIFIER>;
// XmlnsDaml : Attribute;
// XmlnsDc : Attribute;
diff --git a/owl.jjt b/owl.jjt
index 3a6838fa3983b1758240b0264ecd21caa4bd734e..67ef6261315176ca7a4d3a473a850ab7aa07879b 100644
--- a/owl.jjt
+++ b/owl.jjt
@@ -1,9 +1,22 @@
/* -*-Java-*- */
/*
- * Copyright (C) 2006 Anders Nilsson <anders.nilsson@cs.lth.se>
+ * Copyright (C) 2006,2010 Anders Nilsson <anders.nilsson@control.lth.se>
*
* This file is part of OntologyCompiler.
+ *
+ * OntologyCompiler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * OntologyCompiler 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 General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with OntologyCompiler. If not, see <http://www.gnu.org/licenses/>.
*/
options {
@@ -14,7 +27,7 @@ options {
NODE_PREFIX = "";
JAVA_UNICODE_ESCAPE = true;
STATIC = false;
-// DEBUG_PARSER = true;
+ // DEBUG_PARSER = true;
// DEBUG_LOOKAHEAD = true;
// DEBUG_TOKEN_MANAGER = true;
} // options
@@ -55,7 +68,7 @@ SPECIAL_TOKEN : /* COMMENTS */
// <SLASH_STAR_COMMENT : "/*" (~["*"])* "*" ("*" | (~["*","/"] (~["*"])* "*"))* "/" >
< "<!--" ( ~["-"] | ( "-" ~["-"] ) )* "-->">
| < "<rdfs:comment" ( ~["<"] | ( "<" ~["/"] ) )* "</rdfs:comment>" >
- | < "<!DOCTYPE rdf:RDF [" ( ~["]"] )* "]>" >
+ | < "<!DOCTYPE" ( ~["]"] )* "]>" >
// <XML_COMMENT : "<!--" (~["-","-",">"])* "-->" >
}// COMMENTS
@@ -67,7 +80,36 @@ SPECIAL_TOKEN : /* COMMENTS */
<DEFAULT, BOUNDS> TOKEN : /* RESERVED WORDS AND LITERALS */
{
- < LIST_FIRST : "list:first" >
+ < ABBREVIATEDIRI : "abbreviatedIRI" >
+ | < ANNOTATION : "Annotation" >
+ | < ANNOTATIONPROPERTY : "AnnotationProperty" >
+ | < CARDINALITY : "cardinality" >
+ | < CLASS : "Class" >
+ | < CLASSASSERTION : "ClassAssertion" >
+ | < DATAPROPERTY : "DataProperty" >
+ | < DATAPROPERTYDOMAIN : "DataPropertyDomain" >
+ | < DATAPROPERTYRANGE : "DataPropertyRange" >
+ | < DATATYPE : "Datatype" >
+ | < DATATYPEIRI : "datatypeIRI" >
+ | < DECLARATION : "Declaration" >
+ | < IRI : "IRI" >
+ | < LITERAL : "Literal" >
+ | < NAME : "name" >
+ | < NAMEDINDIVIDUAL : "NamedIndividual" >
+ | < OBJECTEXACTCARDINALITY : "ObjectExactCardinality" >
+ | < OBJECTMINCARDINALITY : "ObjectMinCardinality" >
+ | < OBJECTSOMEVALUESFROM : "ObjectSomeValuesFrom" >
+ | < OBJECTPROPERTY : "ObjectProperty" >
+ | < OBJECTPROPERTYASSERTION : "ObjectPropertyAssertion" >
+ | < OBJECTPROPERTYDOMAIN : "ObjectPropertyDomain" >
+ | < ONTOLOGY : "Ontology" >
+ | < ONTOLOGYIRI : "ontologyIRI" >
+ | < PREFIX : "Prefix" >
+ | < SUBCLASSOF : "SubClassOf" >
+
+
+// Compatibility with older ontology format (RDF) below.
+ | < LIST_FIRST : "list:first" >
| < LIST_REST : "list:rest" >
| < EXPR_KIFCONDITION : "expr:KIF-Condition" >
| < EXPR_EXPRESSIONDATA : "expr:expressionData" >
@@ -145,6 +187,7 @@ SPECIAL_TOKEN : /* COMMENTS */
| < XML : "xml" >
| < XML_BASE : "xml:base" >
| < XMLNS : "xmlns" >
+ | < XMLNS_XML : "xmlns:xml" >
| < XMLNS_XX : "xmlns:" >
// | < XMLNS_DAML : "xmlns:daml" >
// | < XMLNS_DC : "xmlns:dc" >
@@ -247,7 +290,9 @@ SPECIAL_TOKEN : /* COMMENTS */
",",
"[",
"]",
- "."
+ ".",
+ "&",
+ "@"
]
>
|
@@ -350,7 +395,8 @@ Start Start() #Start : {}
void Specification() #Specification : {}
{
XmlHeader()
- RdfDeclaration()
+ "<" (RdfDeclaration()
+ | OntologyDeclaration())
}
void XmlHeader() #XmlHeader : {}
@@ -358,9 +404,16 @@ void XmlHeader() #XmlHeader : {}
"<?" <XML> AttributeList() "?>"
}
+void OntologyDeclaration() #Ontology : {}
+{
+ <ONTOLOGY> AttributeList() ">"
+ ElementList()
+ "</" <ONTOLOGY> ">"
+}
+
void RdfDeclaration() #RdfDeclaration : {}
{
- "<" <RDF_RDF> AttributeList() ">"
+ <RDF_RDF> AttributeList() ">"
ElementList()
"</" <RDF_RDF> ">"
}
@@ -373,6 +426,7 @@ void ElementList() #List : {}
void Element() : {}
{
( "<" ( JElement()
+ | OntologyElement()
| OwlElement()
| RdfElement()
| P1Element()
@@ -515,6 +569,150 @@ void ObjectListList() #ObjectListList : {}
(">" ElementList() "</" <OBJECTLIST_LIST> ">" | ElementList() "/>")
}
+void OntologyElement() : {}
+{
+ Annotation()
+ | AnnotationProperty()
+ | Clazz()
+ | ClassAssertion()
+ | DataProperty()
+ | DataPropertyDomain()
+ | DataPropertyRange()
+ | Datatype()
+ | Declaration()
+ | Literal()
+ | NamedIndividual()
+ | ObjectExactCardinality()
+ | ObjectMinCardinality()
+ | ObjectSomeValuesFrom()
+ | ObjectProperty()
+ | ObjectPropertyAssertion()
+ | ObjectPropertyDomain()
+ | Ontology()
+ | Prefix()
+ | SubClassOf()
+}
+
+void Annotation() #Annotation : {}
+{
+ <ANNOTATION> AttributeList()
+ (">" ElementList() "</" <ANNOTATION> ">" | ElementList() "/>")
+}
+
+void AnnotationProperty() #AnnotationProperty : {}
+{
+ <ANNOTATIONPROPERTY> AttributeList()
+ (">" ElementList() "</" <ANNOTATIONPROPERTY> ">" | ElementList() "/>")
+}
+
+void Clazz() #Clazz : {}
+{
+ <CLASS> AttributeList()
+ (">" ElementList() "</" <CLASS> ">" | ElementList() "/>")
+}
+
+void ClassAssertion() #ClassAssertion : {}
+{
+ <CLASSASSERTION> AttributeList()
+ (">" ElementList() "</" <CLASSASSERTION> ">" | ElementList() "/>")
+}
+
+void DataProperty() #DataProperty : {}
+{
+ <DATAPROPERTY> AttributeList()
+ (">" ElementList() "</" <DATAPROPERTY> ">" | ElementList() "/>")
+}
+
+void DataPropertyDomain() #DataPropertyDomain : {}
+{
+ <DATAPROPERTYDOMAIN> AttributeList()
+ (">" ElementList() "</" <DATAPROPERTYDOMAIN> ">" | ElementList() "/>")
+}
+
+void DataPropertyRange() #DataPropertyRange : {}
+{
+ <DATAPROPERTYRANGE> AttributeList()
+ (">" ElementList() "</" <DATAPROPERTYRANGE> ">" | ElementList() "/>")
+}
+
+void Datatype() #Datatype : {}
+{
+ <DATATYPE> AttributeList()
+ (">" ElementList() "</" <DATATYPE> ">" | ElementList() "/>")
+}
+
+void Declaration() #Declaration : {}
+{
+ <DECLARATION> AttributeList()
+ (">" ElementList() "</" <DECLARATION> ">" | ElementList() "/>")
+}
+
+void Literal() #Literal : {}
+{
+ <LITERAL> AttributeList()
+ (">" ElementList() "</" <LITERAL> ">" | ElementList() "/>")
+}
+
+void NamedIndividual() #NamedIndividual : {}
+{
+ <NAMEDINDIVIDUAL> AttributeList()
+ (">" ElementList() "</" <NAMEDINDIVIDUAL> ">" | ElementList() "/>")
+}
+
+void ObjectExactCardinality() #ObjectExactCardinality : {}
+{
+ <OBJECTEXACTCARDINALITY> AttributeList()
+ (">" ElementList() "</" <OBJECTEXACTCARDINALITY> ">" | ElementList() "/>")
+}
+
+void ObjectMinCardinality() #ObjectMinCardinality : {}
+{
+ <OBJECTMINCARDINALITY> AttributeList()
+ (">" ElementList() "</" <OBJECTMINCARDINALITY> ">" | ElementList() "/>")
+}
+
+void ObjectSomeValuesFrom() #ObjectSomeValuesFrom : {}
+{
+ <OBJECTSOMEVALUESFROM> AttributeList()
+ (">" ElementList() "</" <OBJECTSOMEVALUESFROM> ">" | ElementList() "/>")
+}
+
+void ObjectProperty() #ObjectProperty : {}
+{
+ <OBJECTPROPERTY> AttributeList()
+ (">" ElementList() "</" <OBJECTPROPERTY> ">" | ElementList() "/>")
+}
+
+void ObjectPropertyAssertion() #ObjectPropertyAssertion : {}
+{
+ <OBJECTPROPERTYASSERTION> AttributeList()
+ (">" ElementList() "</" <OBJECTPROPERTYASSERTION> ">" | ElementList() "/>")
+}
+
+void ObjectPropertyDomain() #ObjectPropertyDomain : {}
+{
+ <OBJECTPROPERTYDOMAIN> AttributeList()
+ (">" ElementList() "</" <OBJECTPROPERTYDOMAIN> ">" | ElementList() "/>")
+}
+
+void Ontology() #Ontology : {}
+{
+ <ONTOLOGY> AttributeList()
+ (">" ElementList() "</" <ONTOLOGY> ">" | ElementList() "/>")
+}
+
+void Prefix() #Prefix : {}
+{
+ <PREFIX> AttributeList()
+ (">" ElementList() "</" <PREFIX> ">" | ElementList() "/>")
+}
+
+void SubClassOf() #SubClassOf : {}
+{
+ <SUBCLASSOF> AttributeList()
+ (">" ElementList() "</" <SUBCLASSOF> ">" | ElementList() "/>")
+}
+
void OwlElement() : {}
{
OwlOntology()
@@ -960,6 +1158,7 @@ void AttributeList() #List : {}
void Attribute() : {}
{
Version()
+ | OntologyAttribute()
| RdfAttribute()
| XmlAttribute()
| XmlnsAttribute()
@@ -970,6 +1169,46 @@ void Version() #Version : {}
<VERSION> <ASSIGN> Value()
}
+void OntologyAttribute() : {}
+{
+ AbbreviatedIRI()
+ | Cardinality()
+ | DatatypeIRI()
+ | IRI()
+ | Name()
+ | OntologyIRI()
+}
+
+void AbbreviatedIRI() #AbbreviatedIRI : {}
+{
+ <ABBREVIATEDIRI> <ASSIGN> Value()
+}
+
+void Cardinality() #Cardinality : {}
+{
+ <CARDINALITY> <ASSIGN> Value()
+}
+
+void DatatypeIRI() #DatatypeIRI : {}
+{
+ <DATATYPEIRI> <ASSIGN> Value()
+}
+
+void IRI() #IRI : {}
+{
+ <IRI> <ASSIGN> Value()
+}
+
+void Name() #Name : {}
+{
+ <NAME> <ASSIGN> Value()
+}
+
+void OntologyIRI() #OntologyIRI : {}
+{
+ <ONTOLOGYIRI> <ASSIGN> Value()
+}
+
void RdfAttribute() : {}
{
RdfAbout()
@@ -1017,6 +1256,7 @@ void XmlBase() #XmlBase : {}
void XmlnsAttribute() : {}
{
Xmlns()
+ | XmlnsXml()
| XmlnsXX()
// | XmlnsDaml()
// | XmlnsDc()
@@ -1039,6 +1279,11 @@ void Xmlns() #Xmlns : {}
<XMLNS> <ASSIGN> Value()
}
+void XmlnsXml() #XmlnsXml : {}
+{
+ <XMLNS_XML> <ASSIGN> Value()
+}
+
void XmlnsXX() #XmlnsXX : {Token t;}
{
<XMLNS_XX> t = <IDENTIFIER> <ASSIGN> Value()