Поправљен баг у >= и <= функцијама

LICENSE

@@ -0,0 +1,674 @@
+                    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.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    cirilisp
+    Copyright (C) 2019  Petar Kapris
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    cirilisp  Copyright (C) 2019  Petar Kapris
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Makefile

@@ -1,68 +1,10 @@
-# cirilisp - компајлер за ћирилични дијалекат лиспа
+# cirilisp - интерпретер за ћирилични дијалекат лиспа
 
 # ћирилисп верзија
 VERSION = 0,9
 
-# локација за инсталацију
+ifeq ($(OS), Windows_NT)
-PREFIX = /usr/local
+	include Makefile.win
-LIBPREFIX = $(PREFIX)/lib
+else
-
+	include Makefile.unix
-# флегови за C компајлер и линкер
+endif
-CPPFLAGS = -D_POSIX_C_SOURCE=200200L -DDESTDIR=\"$(DESTDIR)\" \
--DVERSION=\"$(VERSION)\"
-CFLAGS = -g -std=c99 -pedantic -Wall -O0
-# CFLAGS  = -std=c99 -pedantic -Wall -O3
-LDFLAGS = -lm -lc
-
-CC = cc
-
-C_SRC = cirilisp.c read.c eval.c print.c util.c internals.c
-L_SRC = инит.ћ
-INC = util.h read.h eval.h print.h internals.h
-OBJ = $(C_SRC:.c=.o)
-
-all: cirilisp $(L_SRC)
-
-.c.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
-
-$(OBJ): $(INC)
-
-cirilisp: $(OBJ)
-	$(CC) -o $@ $(OBJ) $(LDFLAGS)
-
-clean:
-	-rm -f cirilisp $(OBJ) cirilisp-$(VERSION).tar.gz
-
-# штампа садржај свих фајлова са изворним кодом, користи се за бројање линија,
-# значајних линија, итд.
-concat:
-	@cat $(C_SRC) $(INC) $(L_SRC) Makefile
-
-# филтрира дати улаз и штампа само "значајне" линије кода
-sloc:
-	@grep -v "^[[:space:]]*[{}]\{0,1\}[;\\]\{0,1\}$$"
-
-dist: clean
-	mkdir -p cirilisp-$(VERSION)
-	cp -r Makefile $(INC) $(C_SRC) $(L_SRC) cirilisp-$(VERSION)
-	tar -cf cirilisp-$(VERSION).tar cirilisp-$(VERSION)
-	gzip cirilisp-$(VERSION).tar
-	rm -rf cirilisp-$(VERSION)
-
-install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(LIBPREFIX)/cirilisp
-	cp -f cirilisp $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/cirilisp
-	cp -f $(L_SRC) $(DESTDIR)$(LIBPREFIX)/cirilisp
-#	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-#	sed "s/VERSION/$(VERSION)/g" < cirilisp.1 > $(DESTDIR)$(MANPREFIX)/man1/dwm.1
-#	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/cirilisp.1
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/cirilisp
-	rm -rf $(DESTDIR)$(LIBPREFIX)/cirilisp
-#	rm -f $(DESTDIR)$(MANPREFIX)/man1/cirilisp.1
-
-.PHONY: all clean dist install uninstall concat sloc

Makefile.unix

@@ -0,0 +1,62 @@
+# локација за инсталацију
+PREFIX = /usr/local
+LIBPREFIX = $(PREFIX)/lib
+
+# флегови за C компајлер и линкер
+CPPFLAGS = -D_POSIX_C_SOURCE=2 -DDESTDIR=\"$(DESTDIR)\" -DVERSION=\"$(VERSION)\"
+# CFLAGS = -DDEBUG -g -std=c99 -pedantic -Wall -Wextra -Wno-maybe-uninitialized -O0
+CFLAGS  = -std=c99 -pedantic -Wall -Wextra -Wno-maybe-uninitialized -O3
+LDFLAGS = -lm
+
+CC = gcc
+
+C_SRC = cirilisp.c read.c eval.c print.c util.c internals.c
+L_SRC = инит.ћ
+INC = util.h read.h eval.h print.h internals.h
+OBJ = $(C_SRC:.c=.o)
+
+all: cirilisp $(L_SRC)
+
+.c.o:
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+
+$(OBJ): $(INC)
+
+cirilisp: $(OBJ)
+	$(CC) -o $@ $(OBJ) $(LDFLAGS)
+
+clean:
+	-rm -f cirilisp $(OBJ) cirilisp-$(VERSION).tar.gz
+
+# штампа садржај свих фајлова са изворним кодом, користи се за бројање линија,
+# значајних линија, итд.
+concat:
+	@cat $(C_SRC) $(INC) $(L_SRC) Makefile
+
+# филтрира дати улаз и штампа само "значајне" линије кода
+sloc:
+	@grep -v "^[[:space:]]*[{}]\{0,1\}[;\\]\{0,1\}$$"
+
+dist: clean
+	mkdir -p cirilisp-$(VERSION)
+	cp -r Makefile $(INC) $(C_SRC) $(L_SRC) cirilisp-$(VERSION)
+	tar -cf cirilisp-$(VERSION).tar cirilisp-$(VERSION)
+	gzip cirilisp-$(VERSION).tar
+	rm -rf cirilisp-$(VERSION)
+
+install: all
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(LIBPREFIX)/cirilisp
+	cp -f cirilisp $(DESTDIR)$(PREFIX)/bin
+	chmod 755 $(DESTDIR)$(PREFIX)/bin/cirilisp
+	cp -f $(L_SRC) $(DESTDIR)$(LIBPREFIX)/cirilisp
+#	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+#	sed "s/VERSION/$(VERSION)/g" < cirilisp.1 > $(DESTDIR)$(MANPREFIX)/man1/dwm.1
+#	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/cirilisp.1
+
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/cirilisp
+	rm -rf $(DESTDIR)$(LIBPREFIX)/cirilisp
+#	rm -f $(DESTDIR)$(MANPREFIX)/man1/cirilisp.1
+
+.PHONY: all clean dist install uninstall concat sloc

Makefile.win

@@ -0,0 +1,62 @@
+# ëîêàöè¼à çà èíñòàëàöè¼ó
+PREFIX = C:\\Program\ Files\\cirilisp
+LIBPREFIX = $(PREFIX)/lib
+
+# ôëåãîâè çà C êîìïà¼ëåð è ëèíêåð
+CPPFLAGS = -D_POSIX_C_SOURCE=2 -DDESTDIR=\"$(DESTDIR)\" -DVERSION=\"$(VERSION)\"
+# CFLAGS = -g -std=c99 -pedantic -Wall -Wextra -Wno-maybe-uninitialized -O0
+CFLAGS  = -std=c99 -pedantic -Wall -Wextra -Wno-maybe-uninitialized -O3
+LDFLAGS = -lm
+
+CC = gcc
+
+C_SRC = cirilisp.c read.c eval.c print.c util.c internals.c
+L_SRC = èíèò.ž
+INC = util.h read.h eval.h print.h internals.h
+OBJ = $(C_SRC:.c=.o)
+
+all: cirilisp $(L_SRC)
+
+.c.o:
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+
+$(OBJ): $(INC)
+
+cirilisp: $(OBJ)
+	$(CC) -o $@ $(OBJ) $(LDFLAGS)
+
+clean:
+	-del -f cirilisp $(OBJ) cirilisp-$(VERSION).tar.gz
+
+# øòàìïà ñàäðæ༠ñâèõ ôà¼ëîâà ñà èçâîðíèì êîäîì, êîðèñòè ñå çà áðî¼àœå ëèíè¼à,
+# çíà÷à¼íèõ ëèíè¼à, èòä.
+concat:
+	@cat $(C_SRC) $(INC) $(L_SRC) Makefile
+
+# ôèëòðèðà äàòè óëàç è øòàìïà ñàìî "çíà÷à¼íå" ëèíè¼å êîäà
+sloc:
+	@grep -v "^[[:space:]]*[{}]\{0,1\}[;\\]\{0,1\}$$"
+
+dist: clean
+	mkdir -p cirilisp-$(VERSION)
+	cp -r Makefile $(INC) $(C_SRC) $(L_SRC) cirilisp-$(VERSION)
+	tar -cf cirilisp-$(VERSION).tar cirilisp-$(VERSION)
+	gzip cirilisp-$(VERSION).tar
+	rm -rf cirilisp-$(VERSION)
+
+install: all
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(LIBPREFIX)/cirilisp
+	cp -f cirilisp $(DESTDIR)$(PREFIX)/bin
+	chmod 755 $(DESTDIR)$(PREFIX)/bin/cirilisp
+	cp -f $(L_SRC) $(DESTDIR)$(LIBPREFIX)/cirilisp
+#	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+#	sed "s/VERSION/$(VERSION)/g" < cirilisp.1 > $(DESTDIR)$(MANPREFIX)/man1/dwm.1
+#	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/cirilisp.1
+
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/cirilisp
+	rm -rf $(DESTDIR)$(LIBPREFIX)/cirilisp
+#	rm -f $(DESTDIR)$(MANPREFIX)/man1/cirilisp.1
+
+.PHONY: all clean dist install uninstall concat sloc

cirilisp.c

@@ -8,6 +8,8 @@
 #include "eval.h"
 #include "print.h"
 
+extern env globalEnv;
+
 extern int eofStatus;
 int load(char *pathname)
 {
@@ -33,13 +35,30 @@ int load(char *pathname)
 	return 1;
 }
 
+void exitCirilisp(int exitStatus)
+/* терминира програм са жељеним излазним статусом, притом брише глобално
+ * окружење које једино и може бити активно током изласка из програма, и
+ * брише још неке динамички алоциране предмете у меморији */
+{
+	if (globalEnv != NULL)
+	{
+		removeEnvironment(globalEnv);
+	}
+	extern wchar_t *globalBuffer;
+	if (globalBuffer != NULL)
+	{
+		free(globalBuffer);
+	}
+	exit(exitStatus);
+}
+
 void init()
 {
 	if (setlocale(LC_ALL, "sr_RS.utf8") == NULL)
 	{
 		fprintf(stderr, "lokal programa se nije mogao podesiti na\
 \"sr_RS.utf8\", proverite da li ste ga osposobili na vasem sistemu\n");
-		exit(0);
+		exitCirilisp(0);
 	}
 /* Омогућава библиотекама коришћеним у интерпретеру да протумаче српску
  * ћирилицу */
@@ -65,7 +84,7 @@ void init()
 	addSymbolInternal("карактер", &charInt, 0);
 	addSymbolInternal("карактер?", &charQInt, 0);
 	addSymbolInternal("конс?", &consQInt, 0);
-	addSymbolInternal("ламбда", &lambdaInt, 1);
+	addSymbolInternal("људи", &lambdaInt, 1);
 	addSymbolInternal("прикажи", &displayInt, 0);
 	addSymbolInternal("нил?", &nilQInt, 0);
 	addSymbolInternal("направи-ниску", &makeStrInt, 0);
@@ -74,7 +93,7 @@ void init()
 	addSymbolInternal("нетачно->тачно", &inexactToExactInt, 0);
 	addSymbolInternal("опиши", &defineInt, 1);
 	addSymbolInternal("опиши-складњу", &defineMacroInt, 1);
-	addSymbolInternal("почни", &beginInt, 0);
+	addSymbolInternal("почни", &beginInt, 1);
 	addSymbolInternal("ниска?", &stringQInt, 0);
 	addSymbolInternal("сар", &carInt, 0);
 	addSymbolInternal("разломак?", &fractionQInt, 0);
@@ -92,7 +111,7 @@ void init()
 	{
 		fprintf(stderr, "Није пронађена стандардна ЋИРЛИСП библиотека\
 \nПрограм се није могао правилно покренути\n");
-		exit(3);
+		exitCirilisp(3);
 	}
 }
 
@@ -120,15 +139,15 @@ int main(int argc, char **argv)
 			break;
 		case 'v':
 			printf("Верзија: " VERSION "\n");
-			exit(0);
+			exitCirilisp(0);
 			break;
 		case 'h':
 			printf(help);
-			exit(0);
+			exitCirilisp(0);
 			break;
 		default:
 			fprintf(stderr, "Непозната командна опција");
-			exit(1);
+			exitCirilisp(1);
 		}
 	}
 
@@ -138,20 +157,21 @@ int main(int argc, char **argv)
 		{
 			fprintf(stderr, "Није било могуће отворити фајл %s.\n\
 Проверите да ли дати фајл заиста постоји\n", argv[optind]);
-			exit(2);
+			exitCirilisp(2);
 		}
 		++optind;
 	}
 
 	if (quitFlag)
 	{
-		exit(0);
+		exitCirilisp(0);
 	}
 
 	printf("Добродошли у ЋИРИЛИСП ЧПШП окружење, верзија: " VERSION "\n");
-	while (Print(Eval(Read("Ћ> ", stdin), globalEnv)))
+	object current;
-		;
+	while (Print(current = Eval(Read("Ћ> ", stdin), globalEnv)))
+		deleteObject(current);
 	printf("\nДостигнут крај улазног тока.\nЗбогом и дођите нам опет!\n");
 
-	return 0;
+	exitCirilisp(0);
 }

doc/maturskiRad/rad.tex

@@ -1278,11 +1278,13 @@ int main(int argc, char **argv)
 \newpage
 \section*{Биографија матуранта}
 \addcontentsline{toc}{section}{\protect\numberline{}Биографија Матуранта}
-Ја сам Петар Каприш, ученик гимназије ,,Јован Јовановић Змај'', рођен 11. јула 2019.
+Ја сам Петар Каприш, ученик гимназије ,,Јован Јовановић Змај'', рођен 11. јула 2000.
 
 \begin{wrapfigure}{r}{0.5\textwidth}
 	\begin{center}
-		\includegraphics[width=0.5\linewidth]{../../IBI_7206.JPG}
+		\IfFileExists{./../../../MMM_5394.jpg}
+		{\includegraphics[width=0.5\linewidth]{../../../MMM_5394.jpg}}
+		{НАЈС ТРАЈ ЕФ-БИ-АЈ!}
 	\end{center}
 	\caption{Моја слика}
 \end{wrapfigure}

eval.c

@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -6,90 +5,6 @@
 #include "internals.h"
 #include "eval.h"
 
-int currentRecursionDepth = 0;
-int maxRecursionDepth = 10000;
-
-object apply(object function, object parameters, env currentEnv);
-
-object Eval(object input, env currentEnv)
-{
-	object result;
-
-	if (TYPE(input) == symbolObject)
-	{
-		result = referVariable(SYM(input), currentEnv);
-	}
-	else if (TYPE(input) == consObject)
-	{
-		if (!properList(input))
-		{
-			deleteObject(input);
-			SIGERR(improperListError);
-		}
-		else
-		{
-			int regularEvalOrder = 1;
-			CAR(input) = Eval(CAR(input), currentEnv);
-			if (TYPE(CAR(input)) == errorObject)
-			{
-				result = copyObject(CAR(input));
-				deleteObject(input);
-				CPYERR(ERR(result));
-			}
-
-			if (TYPE(CAR(input)) == procedureObject &&
-				PROC_SPECIAL(CAR(input)))
-			{
-				regularEvalOrder = 0;
-			}
-
-			object *currentCell = &CDR(input);
-			int noErrors = 1;
-			if (regularEvalOrder)
-			{
-				while (TYPE(*currentCell) != nilObject)
-				{
-					CAR(*currentCell) =
-						Eval(CAR(*currentCell),
-								currentEnv);
-
-					if (TYPE(CAR(*currentCell)) ==
-							errorObject)
-					{
-						noErrors = 0;
-						object err = copyObject(
-							CAR(*currentCell));
-						deleteObject(input);
-						CPYERR(ERR(err));
-						break;
-					}
-					currentCell = &CDR(*currentCell);
-				}
-			}
-
-			if (noErrors)
-			{
-				result = apply(CAR(input), CDR(input),
-						currentEnv);
-			}
-
-			if (TYPE(CAR(input)) == procedureObject &&
-				PROC_SPECIAL(CAR(input)) &&
-				PROC_TYPE(CAR(input)) == compoundProc)
-			{
-				result = Eval(result, currentEnv);
-			}
-		}
-	}
-	else
-	{
-		result = copyObject(input);
-	}
-
-	deleteObject(input);
-	return result;
-}
-
 int bindArgs(object parameters, object args, env newEnv)
 /* на почетку извршавања функције, везује прослеђене параметре, за симболе у
  * дефиницији функције, везивање се врши у новонасталом окружењу, уколико је
@@ -142,20 +57,133 @@ int bindArgs(object parameters, object args, env newEnv)
 	}
 }
 
-object apply(object procedure, object parameters, env currentEnv)
+object Eval(object input, env currentEnv)
 {
 	object result;
+	int tailExpression = 0, macroEvalPending;
+
+eval:
+	macroEvalPending = 0;
+	if (TYPE(input) == symbolObject)
+	{
+		result = referVariable(SYM(input), currentEnv);
+	}
+	else if (TYPE(input) == consObject)
+	{
+		if (!properList(input))
+		{
+			deleteObject(input);
+			SIGERR(improperListError);
+		}
+
+		int regularEvalOrder = 1;
+		CAR(input) = Eval(CAR(input), currentEnv);
+		if (TYPE(CAR(input)) == errorObject)
+		{
+			result = copyObject(CAR(input));
+			deleteObject(input);
+			CPYERR(ERR(result));
+		}
+
+		if (TYPE(CAR(input)) == procedureObject &&
+			PROC_SPECIAL(CAR(input)))
+		{
+			regularEvalOrder = 0;
+		}
+
+		object *currentCell = &CDR(input);
+		int noErrors = 1;
+		if (regularEvalOrder)
+		{
+			while (TYPE(*currentCell) != nilObject)
+			{
+				CAR(*currentCell) =
+					Eval(CAR(*currentCell), currentEnv);
+
+				if (TYPE(CAR(*currentCell)) == errorObject)
+				{
+					noErrors = 0;
+					object err =
+						copyObject(CAR(*currentCell));
+					deleteObject(input);
+					CPYERR(ERR(err));
+					break;
+				}
+				currentCell = &CDR(*currentCell);
+			}
+			if (noErrors)
+			{
+				goto apply;
+			}
+		}
+		else
+		{
+			if (TYPE(CAR(input)) == procedureObject &&
+				PROC_SPECIAL(CAR(input)) &&
+				PROC_TYPE(CAR(input)) == compoundProc)
+			{
+				macroEvalPending = 1;
+			}
+			goto apply;
+		}
+	}
+	else
+	{
+		result = copyObject(input);
+	}
+
+	if (tailExpression)
+	{
+		removeEnvironment(currentEnv);
+	}
+	deleteObject(input);
+	return result;
+
+	object procedure, parameters;
+apply:
+	procedure = copyObject(CAR(input));
+	parameters = copyObject(CDR(input));
+	deleteObject(input);
 
 	if (TYPE(procedure) != procedureObject)
 	{
+		deleteObject(procedure);
+		deleteObject(parameters);
 		SIGERR(notApplicableError);
 	}
 
 	if (PROC_TYPE(procedure) == builtinProc)
 	{
 		object(*f)() = PROC_BUILTIN(procedure);
+
+		if (f == ifInt)
+		{
+			if (listLength(parameters) >= 2)
+			{
+				CAR(CDR(parameters)) =
+				quoteExpression(CAR(CDR(parameters)));
+			}
+			if (listLength(parameters) >= 3)
+			{
+				CAR(CDR(CDR(parameters))) =
+				quoteExpression(CAR(CDR(CDR(parameters))));
+			}
+		}
+		else if (f == beginInt)
+		{
+			if (listLength(parameters) >= 1)
+			{
+				object *current = &parameters;
+				while (TYPE(CDR(*current)) != nilObject)
+				{
+					current = &CDR(*current);
+				}
+				CAR(*current) = quoteExpression(CAR(*current));
+			}
+		}
+
 		if (f == defineInt || f == lambdaInt || f == ifInt ||
-			f == applyInt)
+			f == applyInt || f == defineMacroInt || f == beginInt)
 		{
 			result = f(parameters, currentEnv);
 		}
@@ -164,41 +192,78 @@ object apply(object procedure, object parameters, env currentEnv)
 			result = f(parameters);
 		}
 
+		deleteObject(procedure);
+		deleteObject(parameters);
+		if (f == beginInt || f == ifInt)
+		{
+			input = result;
+			goto eval;
+		}
+		else if (tailExpression)
+		{
+			removeEnvironment(currentEnv);
+		}
+
 		return result;
 	}
 
-	if (++currentRecursionDepth > maxRecursionDepth)
-	{
-		--currentRecursionDepth;
-		SIGERR(maxRecursionDepthError);
-	}
 	object args = copyObject(PROC_COMP_ARGS(procedure));
-	object body = copyObject(PROC_COMP_BODY(procedure));
 	env definitionEnv = PROC_COMP_ENV(procedure);
+	env procEnv;
+
+	if (tailExpression && !macroEvalPending)
+	{
+		if (definitionEnv == currentEnv)
+		{
+			procEnv = currentEnv;
+		}
+		else
+		{
+			removeEnvironment(currentEnv);
+			procEnv = createEnvironment(definitionEnv);
+		}
+	}
+	else
+	{
+		procEnv = createEnvironment(definitionEnv);
+	}
 
-	env procEnv = createEnvironment(definitionEnv);
 	if (!bindArgs(parameters, args, procEnv))
 	{
 		deleteObject(args);
-		deleteObject(body);
 		removeEnvironment(procEnv);
+		deleteObject(procedure);
+		deleteObject(parameters);
 		SIGERR(argumentNumberError);
 	}
-
-	object *currentSubProc = &body;
-	while (TYPE(*currentSubProc) != nilObject)
-	{
-		CAR(*currentSubProc) = Eval(CAR(*currentSubProc), procEnv);
-		if (TYPE(CDR(*currentSubProc)) == nilObject)
-		{
-			result = copyObject(CAR(*currentSubProc));
-		}
-		currentSubProc = &CDR(*currentSubProc);
-	}
 	deleteObject(args);
-	deleteObject(body);
-	removeEnvironment(procEnv);
-	--currentRecursionDepth;
 
-	return result;
+	object *currentExprPointer = &PROC_COMP_BODY(procedure);
+	object currentExpr;
+	while (TYPE(CDR(*currentExprPointer)) != nilObject)
+	/* сви изрази осим задњег */
+	{
+		currentExpr = copyObject(CAR(*currentExprPointer));
+		currentExpr = Eval(currentExpr, procEnv);
+
+		deleteObject(currentExpr);
+		currentExprPointer = &CDR(*currentExprPointer);
+	}
+	/* репни израз */
+	currentExpr = copyObject(CAR(*currentExprPointer));
+
+	deleteObject(procedure);
+	deleteObject(parameters);
+	input = currentExpr;
+	if (macroEvalPending)
+	{
+		input = Eval(input, procEnv);
+		removeEnvironment(procEnv);
+	}
+	else
+	{
+		currentEnv = procEnv;
+		tailExpression = 1;
+	}
+	goto eval;
 }

eval.h

@@ -1,4 +1,3 @@
 #pragma once
 
 object Eval(object input, env currentEnv);
-object apply(object function, object parameters, env currentEnv);

internals.c

@@ -358,6 +358,7 @@ object defineInt(object parameters, env currentEnv)
 					currentEnv);
 				addSymbolVariable(SYM(result), proc,
 					currentEnv);
+				deleteObject(proc);
 			}
 			else
 			{
@@ -400,6 +401,7 @@ object defineMacroInt(object parameters, env currentEnv)
 			object proc = lambdaInt(parameters, currentEnv);
 			PROC_SPECIAL(proc) = 1;
 			addSymbolVariable(SYM(result), proc, currentEnv);
+			deleteObject(proc);
 		}
 		else
 		{
@@ -761,6 +763,8 @@ object eqvQInt(object parameters)
 
 object applyInt(object parameters, env currentEnv)
 {
+	object expression;
+
 	if (listLength(parameters) != 2)
 	{
 		SIGERR(argumentNumberError);
@@ -770,7 +774,38 @@ object applyInt(object parameters, env currentEnv)
 	{
 		SIGERR(typeError);
 	}
-	return apply(CAR(parameters), CAR(CDR(parameters)), currentEnv);
+	/* ово извршавање "примени" функције се врши тако што се "наводи" сваки
+	 * појединачни члан листе параметара, и потом ствара комплетан израз
+	 * који се евалуира, што укључује и примену функције, ово се чини јер
+	 * по тренутном дизајну интерпретера засебна "примени" функција као
+	 * таква не постоји */
+	TYPE(expression) = consObject;
+	CONS(expression) = malloc(sizeof(cons));
+	CAR(expression) = copyObject(CAR(parameters));
+	CDR(expression) = copyObject(CAR(CDR(parameters)));
+
+	/* први аргумент се евалуира да би "примени" могао познати да ли се
+	 * заиста ради о функцији, и да ли је она нормална или специјална
+	 * (јер ако је специјална "навођење" аргумената ремети извршавање) */
+	CAR(expression) = Eval(CAR(expression), currentEnv);
+
+	if (TYPE(CAR(expression)) != procedureObject)
+	{
+		deleteObject(expression);
+		SIGERR(notApplicableError);
+	}
+
+	if (!PROC_SPECIAL(CAR(expression)))
+	{
+		object *current = &expression;
+		while (TYPE(*current) != nilObject)
+		{
+			CAR(*current) = quoteExpression(CAR(*current));
+			current = &CDR(*current);
+		}
+	}
+
+	return Eval(expression, currentEnv);
 }
 
 object displayInt(object parameters)
@@ -816,7 +851,7 @@ object readInt(object parameters)
 	return Read("", stdin);
 }
 
-object beginInt(object parameters)
+object beginInt(object parameters, env currentEnv)
 {
 	object last;
 	if (listLength(parameters) == 0)
@@ -826,11 +861,22 @@ object beginInt(object parameters)
 	else
 	{
 		object *current = &parameters;
+		object currentResult;
 		while (TYPE(CDR(*current)) != nilObject)
 		{
+			currentResult = Eval(copyObject(CAR(*current)), currentEnv);
+			if (TYPE(currentResult) == errorObject)
+			{
+				CPYERR(ERR(currentResult));
+			}
+
 			current = &CDR(*current);
 		}
-		last = copyObject(CAR(*current));
+		last = Eval(copyObject(CAR(*current)), currentEnv);
+		if (TYPE(last) == errorObject)
+		{
+			CPYERR(ERR(last));
+		}
 	}
 	return last;
 }

print.c

@@ -6,21 +6,23 @@ void printValue(object input);
 
 int Print(object input)
 {
-	if (TYPE(input) == errorObject)
+	switch (TYPE(input))
 	{
+	case errorObject:
 		fprintf(stderr, "\nГРЕШКА: %s\n\n", ERR(input));
-	}
+		break;
-	else if (TYPE(input) == EOFObject)
+	case EOFObject:
-	{
 		return 0;
-	}
+		break;
-	else if (TYPE(input) != unspecifiedObject)
+	case unspecifiedObject:
-	{
+		break;
+	default:
 		printf("\n");
 		printValue(input);
 		printf("\n\n");
+		break;
 	}
-	deleteObject(input);
+
 	return 1;
 }
 
@@ -92,6 +94,7 @@ void printValue(object input)
 			break;
 		case L'\0':
 			printf("нул");
+			break;
 		default:
 			printf("%lc", CHR(input));
 		}
@@ -100,3 +103,30 @@ void printValue(object input)
 		break;
 	}
 }
+
+#ifdef DEBUG
+void PrintEntry(entry *e)
+{
+	if (e == NULL)
+	{
+		return;
+	}
+	PrintEntry(e->left);
+	printf("%s: ", e->name);
+	Print(e->value);
+	PrintEntry(e->right);
+}
+
+void PrintEnv(env environment)
+{
+	printf("%p", (void *) environment);
+	env enclosings = environment->enclosing;
+	while (enclosings != NULL)
+	{
+		printf(" <-- %p", (void *) enclosings);
+		enclosings = enclosings->enclosing;
+	}
+	printf("\n");
+	PrintEntry(environment->table);
+}
+#endif

read.c

@@ -4,7 +4,6 @@
 #include <wctype.h>
 #include <ctype.h>
 #include <string.h>
-#include <regex.h>
 
 #include "util.h"
 #include "read.h"
@@ -138,12 +137,45 @@ wint_t unscanwc(wint_t c, FILE *stream)
 	}
 }
 
-int lengthDigitArray(char *s)
+int validFracNum(char *s)
 {
-	int i;
+	char *endptr;
-	for (i = 0; isdigit(s[i]); ++i)
+	strtoll(s, &endptr, 10);
-		;
+	if (*endptr == '\0' && endptr != s)
-	return i;
+	{
+		return 1;
+	}
+	else if (*endptr == '/' && endptr != s)
+	{
+		char *denom = endptr + 1;
+		strtoll(denom, &endptr, 10);
+		if (*endptr == '\0' && endptr != denom)
+		{
+			return 1;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+int validRealNum(char *s)
+{
+	char *endptr;
+	strtold(s, &endptr);
+	if (*endptr == '\0')
+	{
+		return 1;
+	}
+	else
+	{
+		return 0;
+	}
 }
 
 object getToken(FILE *stream)
@@ -190,25 +222,17 @@ object getToken(FILE *stream)
 	char *s = malloc(n * sizeof(char));
 	wcstombs(s, buffer, n);
 
-	regex_t regNumberFrac, regNumberReal;
+	char *endptr;
-	regcomp(&regNumberFrac, "^[-+]?[[:digit:]]+(/[[:digit:]]+)?$",
+	if (validFracNum(s))
-						REG_EXTENDED);
-	regcomp(&regNumberReal, "^[-+]?[[:digit:]]*,[[:digit:]]+$",
-						REG_EXTENDED);
-	const int nmatches = 1;
-	regmatch_t a[nmatches];
-
-	if (!regexec(&regNumberFrac, s, nmatches, a, 0))
 	{
 		TYPE(result) = numberObject;
 		NUM_TYPE(result) = fractionNum;
-		NUM_NUMER(result) = atoll(s);
+		NUM_NUMER(result) = strtoll(s, &endptr, 10);
-		char *tmp;
+		NUM_DENOM(result) = *endptr == '/' ?
-		NUM_DENOM(result) = (tmp = strchr(s, '/')) == NULL ?
+			strtoll(endptr + 1, &endptr, 10) : 1;
-			1 : atoll(tmp + 1);
 		result = shortenFractionNum(result);
 	}
-	else if (!regexec(&regNumberReal, s, nmatches, a, 0))
+	else if (validRealNum(s))
 	{
 		TYPE(result) = numberObject;
 		NUM_TYPE(result) = realNum;
@@ -220,8 +244,7 @@ object getToken(FILE *stream)
 		SYM(result) = malloc((strlen(s) + 1) * sizeof(char));
 		strcpy(SYM(result), s);
 	}
-	regfree(&regNumberFrac);
+	free(s);
-	regfree(&regNumberReal);
 
 	return result;
 }
@@ -343,6 +366,7 @@ object dispatchedChar(wint_t c, FILE *stream)
 		break;
 	case WEOF:
 		SIGERR(unexpectedEOFError);
+		break;
 	default:
 		SIGERR(invalidHashSequenceError);
 		break;
@@ -370,6 +394,7 @@ object macroFunction(wchar_t m, FILE *stream)
 				!strcmp(ERR(currentObject),
 					commonErrs[unmatchedParenError]))
 			{
+				deleteObject(currentObject);
 				TYPE(*listCurrent) = nilObject;
 				break;
 			}

util.c

@@ -5,6 +5,8 @@
 
 #include "util.h"
 
+env globalEnv = NULL;
+
 char *commonErrs[] =
 {
 	"Конс објекат мора бити правилна листа да би могао бити евалуиран",
@@ -113,12 +115,12 @@ void addSymbolVariable(char *symbol, object variable, env currentEnv)
 	else
 	{
 		*e = malloc(sizeof(entry));
+		(*e)->left = (*e)->right = NULL;
 	}
 
 	(*e)->value = copyObject(variable);
 	(*e)->name = malloc(sizeof(char) * (strlen(symbol) + 1));
 	strcpy((*e)->name, symbol);
-	(*e)->left = (*e)->right = NULL;
 }
 
 object referVariable(char *symbol, env currentEnv)
@@ -177,35 +179,49 @@ int improperListLength(object list)
 
 void deleteObject(object input)
 {
-	if (TYPE(input) == symbolObject && SYM(input) != NULL)
+	switch (TYPE(input))
-	{
-		free(SYM(input));
-		SYM(input) = NULL;
-	}
-	else if (TYPE(input) == stringObject && STR(input) != NULL)
-	{
-		free(STR(input));
-		STR(input) = NULL;
-	}
-	else if (TYPE(input) == errorObject && ERR(input) != NULL)
-	{
-		free(ERR(input));
-		ERR(input) = NULL;
-	}
-	else if (TYPE(input) == procedureObject &&
-			PROC_TYPE(input) == compoundProc)
-	{
-		deleteObject(PROC_COMP_ARGS(input));
-		deleteObject(PROC_COMP_BODY(input));
-		free(PROC(input));
-		PROC(input) = NULL;
-	}
-	else if (TYPE(input) == consObject)
 	{
+	case consObject:
 		deleteObject(CAR(input));
 		deleteObject(CDR(input));
 		free(CONS(input));
 		CONS(input) = NULL;
+		break;
+	case procedureObject:
+		if (PROC_TYPE(input) == compoundProc)
+		{
+			deleteObject(PROC_COMP_ARGS(input));
+			deleteObject(PROC_COMP_BODY(input));
+		}
+		free(PROC(input));
+		PROC(input) = NULL;
+		break;
+	case symbolObject:
+		if (SYM(input) == NULL)
+		{
+			break;
+		}
+		free(SYM(input));
+		SYM(input) = NULL;
+		break;
+	case stringObject:
+		if (STR(input) == NULL)
+		{
+			break;
+		}
+		free(STR(input));
+		STR(input) = NULL;
+		break;
+	case errorObject:
+		if (ERR(input) == NULL)
+		{
+			break;
+		}
+		free(ERR(input));
+		ERR(input) = NULL;
+		break;
+	default:
+		break;
 	}
 
 	TYPE(input) = nilObject;
@@ -270,6 +286,23 @@ object copyObject(object input)
 	return result;
 }
 
+object quoteExpression(object input)
+{
+	object result;
+
+	TYPE(result) = consObject;
+	CONS(result) = malloc(sizeof(cons));
+	TYPE(CAR(result)) = symbolObject;
+	SYM(CAR(result)) = malloc(sizeof(char) * (strlen("навод") + 1));
+	strcpy(SYM(CAR(result)), "навод");
+	TYPE(CDR(result)) = consObject;
+	CONS(CDR(result)) = malloc(sizeof(cons));
+	CAR(CDR(result)) = input;
+	TYPE(CDR(CDR(result))) = nilObject;
+
+	return result;
+}
+
 object longlongToNumber(long long int input)
 {
 	object result;

util.h

@@ -171,8 +171,6 @@ struct procedure
 	} value;
 };
 
-env globalEnv;
-
 /******************************* функције везане за окружења */
 env createEnvironment(env enclosing);
 void removeEnvironment(env input);
@@ -195,6 +193,7 @@ int improperListLength(object list);
  * као члан */
 void deleteObject(object input);
 object copyObject(object input);
+object quoteExpression(object input);
 
 object longlongToNumber(long long int input);
 object shortenFractionNum(object a);

инит.ћ

@@ -122,10 +122,23 @@
 				остатак (сар аргументи)))))
 
 (опиши (>= . аргументи)
+	(услов
+		((< (дужина аргументи) 2) #и)
+		((= (дужина аргументи) 2)
 			(или (примени > аргументи) (примени = аргументи)))
+		(#и (и
+			(>= (сар аргументи) (садр аргументи))
+			(примени >= (сдр аргументи))))))
+
 
 (опиши (<= . аргументи)
+	(услов
+		((< (дужина аргументи) 2) #и)
+		((= (дужина аргументи) 2)
 			(или (примени < аргументи) (примени = аргументи)))
+		(#и (и
+			(<= (сар аргументи) (садр аргументи))
+			(примени <= (сдр аргументи))))))
 
 (опиши (цео-број? џ)
 	(= (именилац (нетачно->тачно џ)) 1))