Merge pull request #2 from plexx-dev/0.3-A

0.3 a
merge into main
2023-03-20 08:43:24 +00:00 · 2023-03-20 01:47:39 +01:00 · 2023-03-19 10:03:18 +01:00 · 2023-02-20 22:07:23 +00:00 · 2022-03-27 14:34:45 +02:00 · 2022-03-27 14:34:25 +02:00
14 changed files with 1639 additions and 523 deletions
--- a/674
+++ b/674
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<https://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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -1,10 +1,27 @@
 # Nassi-Shneiderman-Diagramm-Generator
-This python code generates a Nassi Shneiderman Diagramm from Java Source Code
+This python code generates a Nassi Shneiderman Diagramm from Java Source Code.

+Newest Version --> 0.3 A

 How it works:
 In the final version, you will just have to execute the nassi.exe and choose your Code, it will display a preview of the Nassi-Shneiderman-Diagramm and give you the path of the created picture.

 Using:
 Python 3.9.1 with 
+<<<<<<< HEAD
+PySimpleGUI, Pillow
+
+
+## Run
+
+1.  ``` 
+    pip install -r requirements.txt  
+    ```
+2.  ```
+    python run.py
+    ```
+=======
 PySimpleGUI, Pillow, Flask & wtforms
+
+[Just a Visualization of our Progress](https://www.youtube.com/watch?v=WOCruSSG3qg)
+>>>>>>> main
--- a/draw/Iinstruction.py
+++ b/draw/Iinstruction.py
@@ -1,86 +1,78 @@
-"""Iinstruction.py: #TODO"""
+"""Interafce for all instruction types"""

-__author__      = "Weckyy702"
+__author__ ="Weckyy702"

-
-from typing import Iterable, List
 from abc import ABCMeta, abstractmethod
-from draw import code_to_image as cti
+from typing import Tuple, List, Optional

-class Iinstruction(metaclass=ABCMeta):
-    """Base class for all instructions"""
+from . import code_to_image as cti

+class instruction(metaclass=ABCMeta):
    def __init__(self, instruction_text: str) -> None:
        self.instruction_text = instruction_text

    @abstractmethod
-    def to_image(self, x:int, y:int, x_sz: int) -> Iterable[float]:
+    def convert_to_image(self, x: int, y: int, width: int) -> int:
        pass

    @abstractmethod
-    def getblkheight(self) -> float:
-        pass
+    def get_block_width(self):
+        return self.get_text_width()

    @abstractmethod
-    def getblkwidth(self) -> float:
-        pass
-
-    @abstractmethod
-    def __str__(self) -> str:
-        pass
-
-    def _getblkheight(self) -> float:
-        return cti.get_text_size(self.instruction_text)[1] + cti.PADDING_Y #padding
-
-    def _getblkwidth(self) -> float:
-        return cti.get_text_size(self.instruction_text)[0] + cti.PADDING_X #padding
+    def get_block_height(self):
+        return self.get_text_height()


-class generic_instruction(Iinstruction):
-    """Any instruction that is not a control structure"""

+    def get_text_width(self):
+        return cti.get_text_size(self.instruction_text)[0]
+
+    def get_text_height(self):
+        return cti.get_text_size(self.instruction_text)[1]
+
+
+
+class generic_instruction(instruction):
    def __init__(self, instruction_text: str) -> None:
-        Iinstruction.__init__(self, instruction_text)
- 
-    def to_image(self, x:int, y:int, x_sz: int) -> Iterable[float]:
-        return cti.draw_generic_instruction(self.instruction_text, x, y, x_sz, self.getblkheight())
+        super().__init__(instruction_text)

-    def getblkheight(self) -> float:
-        return self._getblkheight()
-    
-    def getblkwidth(self) -> float:
-        return self._getblkwidth()
+    def convert_to_image(self, x: int, y: int, width: int) -> int:
+        height = self.get_block_height()
+        return cti.draw_generic_instruction(self.instruction_text, x, y, width, height)
+
+    def get_block_width(self):
+        return super().get_block_width()
+
+    def get_block_height(self):
+        return super().get_block_height()

    def __str__(self) -> str:
        return self.instruction_text

-class if_instruction(Iinstruction):
-    """Conditional structure
-        NOT.
-        A.
-        LOOP
-    """

-    def __init__(self, instruction_text: str, true_case: List[Iinstruction], false_case: List[Iinstruction]=None) -> None:
-        Iinstruction.__init__(self, instruction_text)
+
+class if_instruction(instruction):
+    def __init__(self, instruction_text: str, true_case: List[instruction], false_case: Optional[List[instruction]]) -> None:
+        super().__init__(instruction_text)
        self.true_case = true_case
        self.false_case = false_case

-    def get_trueheight(self) -> float:
-        sz = 0.0
-        for inst in self.true_case:
-            sz += inst.getblkheight()
-        return sz
+    def convert_to_image(self, x: int, y: int, width: int) -> int:
+        true_width = self.get_true_width()
+        block_height = self.get_block_height()

-    def get_falseheight(self) -> float:
-        sz = 0.0
-        if self.false_case:
-            for inst in self.false_case:
-                sz += inst.getblkwidth()
-        return sz
+        true_x, true_y, false_x, false_y = cti.draw_if_statement(self.instruction_text, x, y, true_width, width, block_height)

+        self.draw_children(true_x, true_y, true_width, false_x, false_y, width-true_width)
+
+        return y + self.get_block_height()
+
+<<<<<<< HEAD
+    def draw_children(self, true_x:int, true_y:int, true_width:int, false_x:int, false_y:int, false_width:int):
+=======
    def get_truewidth(self) -> float:
-        w = 200.0
+        w = 50

        for inst in self.true_case:
            w = max(w, inst.getblkwidth())
@@ -88,69 +80,84 @@ class if_instruction(Iinstruction):
        return w
    
    def get_falsewidth(self) -> float:
-        w = 200.0
+        w = 50

        if self.false_case:
            for inst in self.false_case:
                w = max(w, inst.getblkwidth())

        return w
-
-    def getblkheight(self) -> float:
-        return self._getblkheight() + max(self.get_trueheight(), self.get_falseheight())
-
-    def getblkwidth(self) -> float:
-        return max(self._getblkwidth(), self.get_truewidth() + self.get_falsewidth())
        
    
    def to_image(self, x:int, y:int, x_sz: int) -> Iterable[float]:
        true_w = self.get_truewidth()
-        false_w = self.get_falsewidth()
-        true_x, true_y, false_x, false_y = cti.draw_if_statement(
+        false_w = self.get_falseheight()
+        true_x, true_y, true_sz_x, _, false_x, false_y, false_sz_x, _ = cti.draw_if_statement(
            self.instruction_text, x, y, true_w, false_w, self.getblkheight()
        )
-        self.draw_true_case(true_x, true_y, true_w)
-        self.draw_false_case(false_x, false_y, false_w)
+        self.draw_true_case(true_x, true_y, true_sz_x)
+        self.draw_false_case(false_x, false_y, false_sz_x)
        blk_size = self.getblkheight()
        return x, y + blk_size

    def draw_true_case(self, x: float, y:float, x_sz:float):
+>>>>>>> main
        for instruction in self.true_case:
-            x, y = instruction.to_image(x, y, x_sz)
+            true_y = instruction.convert_to_image(true_x, true_y, true_width)

-    def draw_false_case(self, x: float, y:float, x_sz:float):
        if self.false_case:
            for instruction in self.false_case:
-                x, y = instruction.to_image(x, y, x_sz)
+                false_y = instruction.convert_to_image(false_x, false_y, false_width)

-    def __str__(self) -> str:
-        res = f"if({self.instruction_text}) {'{'}\n"
-        for inst in self.true_case:
-            res += '\t'+str(inst)+";\n"
-        res += "}"
+    def get_block_width(self) -> int:
+        text_width = self.get_text_width()
+        
+        true_width = self.get_true_width()
+        false_width = self.get_false_width()
+
+        return max(text_width, true_width + false_width)
+
+    def get_block_height(self):
+        text_height = self.get_text_height()
+        true_height = self.get_true_height()
+        false_height = self.get_false_height()
+        
+        return text_height + max(true_height, false_height)
+
+    def get_text_width(self):
+        return int(super().get_text_width() * 1.5)
+
+    def get_true_width(self) -> int:
+        width = 200
+        for instruction in self.true_case:
+            width = max(width, instruction.get_block_width())
+        return width
+
+    def get_false_width(self) -> int:
+        width = 200
        if self.false_case:
-            res += " else {"
-            for inst in self.true_case:
-                res += '\t'+str(inst)+";\n"
-            res += "}"
-        return res
+            for instruction in self.false_case:
+                width = max(width, instruction.get_block_width())
+        return width

-# class switch_instruction(Iinstruction):
-#     """Switch structure"""
+    def get_true_height(self) -> int:
+        height = 0

-#     def __init__(self, instruction_text: str, cases: List[List[Iinstruction]]) -> None:
-#         Iinstruction.__init__(self, instruction_text)
-#         self.child_cases = cases
-    
-#     def to_image(self, x:int, y:int, x_sz: int, y_sz: int) -> Iterable[float]:
-#         """TODO: implement"""
-#         return []
+        for instruction in self.true_case:
+            height += instruction.get_block_height()

-#     def draw_children(self, x:float, y:float, x_sz:float, y_sz:float) -> float:
-#         """TODO: implement"""
-#         return 0.0
+        return height

+    def get_false_height(self) -> int:
+        height = 0
+        
+        if self.false_case:
+            for instruction in self.false_case:
+                height += instruction.get_block_height()

+<<<<<<< HEAD
+        return height
+=======

 class while_instruction_front(Iinstruction):

@@ -165,9 +172,9 @@ class while_instruction_front(Iinstruction):
        return children_sz

    def get_children_width(self) -> float:
-        w = 0.0
+        w = 50.0
        for inst in self.child_instructions:
-            w += inst.getblkheight()
+            w = max(w, inst.getblkheight())
        return w

    def getblkheight(self) -> float:
@@ -187,30 +194,107 @@ class while_instruction_front(Iinstruction):
        for inst in self.child_instructions:
            x, y = inst.to_image(x, y, x_sz)
        return self.get_children_height()
+>>>>>>> main

    def __str__(self) -> str:
-        res = "while(" + self.instruction_text + "){\n"
-        for inst in self.child_instructions:
-            res += '\t'+str(inst)+";\n"
-        res += '}'
+        res = "if\n"
+        for instruction in self.true_case:
+            res += '\t' + str(instruction) + '\n'
+
+        if self.false_case:
+            res += "else\n"
+            for instruction in self.false_case:
+                res += '\t' + str(instruction) + '\n'
+        
        return res


-class while_instruction_back(while_instruction_front):
-    def __init__(self, condition: str, instructions: List[Iinstruction]) -> None:
-        while_instruction_front.__init__(self, condition, instructions)
-    
-    def to_image(self, x:int, y:int, x_sz: int):
-        children_x, children_y, children_sz_x = cti.draw_while_loop_back(self.instruction_text, x, y, x_sz, self.getblkheight())
-        self.draw_children(children_x, children_y, children_sz_x)
-        return x, y + self.getblksize()
+
+class while_instruction_front(instruction):
+    def __init__(self, condition_text: str, child_instructions: List[instruction]) -> None:
+        super().__init__(condition_text)
+        self.children = child_instructions
+
+    def convert_to_image(self, x: int, y: int, width: int) -> int:
+        block_height = self.get_block_height()
+
+        children_x, children_y, children_width = cti.draw_while_loop_front(self.instruction_text, x, y, width, block_height)
+
+        self.draw_children(children_x, children_y, children_width)
+
+        return y + block_height
+
+    def draw_children(self, children_x:int, children_y:int, children_width:int):
+        for instruction in self.children:
+            children_y = instruction.convert_to_image(children_x, children_y, children_width)
+
+    def get_block_width(self):
+        width = self.get_text_width()
+
+        for instruction in self.children:
+            width = max(width, instruction.get_block_width() / (1 - cti.BLOCK_OFFSET_RATIO)) #instructions inside a bock take up more space, so compensate for that
+
+        return int(width)
+
+    def get_block_height(self):
+        height = self.get_text_height()
+
+        for instruction in self.children:
+            height += instruction.get_block_height()
+
+        return height

    def __str__(self) -> str:
-        res = "do{\n"
-        for inst in self.child_instructions:
-            res += '\t' +str(inst) + ";\n"
-        res += f"{'}'}while({self.instruction_text});"
+        res = "while\n"
+        for instruction in self.children:
+            res += '\t' + str(instruction) + '\n'
+        return res
+
+class while_instruction_back(while_instruction_front):
+    def __init__(self, condition_text: str, child_instructions: List[instruction]) -> None:
+        super().__init__(condition_text, child_instructions)
+
+    def convert_to_image(self, x: int, y: int, width: int) -> int:
+        block_height = self.get_block_height()
+        children_x, children_y, children_width = cti.draw_while_loop_back(self.instruction_text, x, y, width, block_height)
+
+        self.draw_children(children_x, children_y, children_width)
+
+        return y + block_height
+
+    def __str__(self) -> str:
+        res = "do\n"
+        for instruction in self.children:
+            res += '\t' + str(instruction) + '\n'
+        res += "while"
        return res

 class for_instruction(while_instruction_front):
-    pass
+    def __init__(self, variable_text: str, condition_text: str, child_instruction: List[instruction]) -> None:
+        super().__init__(condition_text, child_instruction)
+        self.variable_instruction = generic_instruction(variable_text)
+
+    def convert_to_image(self, x: int, y: int, width: int) -> int:
+        block_height = super().get_block_height()
+
+        y = self.variable_instruction.convert_to_image(x, y, width)
+
+        children_x, children_y, children_width = cti.draw_while_loop_front(self.instruction_text, x, y, width, block_height)
+        self.draw_children(children_x, children_y, children_width)
+
+        return y + block_height
+
+    def get_block_width(self):
+        return max(super().get_block_width(), self.variable_instruction.get_block_width())
+
+    def get_block_height(self):
+        return super().get_block_height() + self.variable_instruction.get_block_height()
+
+    def __str__(self) -> str:
+        res = str(self.variable_instruction) + '\n'
+        res += "for\n"
+
+        for instruction in self.children:
+            res += "\t" + str(instruction) + '\n'
+        
+        return res
--- a/draw/code_to_image.py
+++ b/draw/code_to_image.py
@@ -2,13 +2,16 @@

 __author__      = "plexx, Weckyy702"

-from typing import Iterable
+from typing import Tuple
 from PIL import Image, ImageDraw, ImageFont
 import os
+import random

-PADDING_X = 100
+PADDING_X = 50
 PADDING_Y = 5

+BLOCK_OFFSET_RATIO = .1
+
 datei_endung = ".png"

 img = None
@@ -16,14 +19,17 @@ output_img = None

 _bkp_font = ImageFont.truetype("res/fonts/NotoSans-Regular.ttf", 12) # ImageFont.load_default()

- #in case set_font does funky stuff, backup the original font
+ERROR_TEXT = "Output image was not initialized! Make sure to call NSD_init first"
+
+#in case set_font does funky stuff, backup the original font
 font = _bkp_font


 def NSD_init(x: float, y: float):
    #get input_img
    global img, output_img
-    #img = Image.open(input_dir + file_name + datei_endung)
+
+
    img = Image.new("RGB", (x, y), "white")
    output_img = ImageDraw.Draw(img)

@@ -38,99 +44,111 @@ def set_font(font_filepath: str):
        raise


-def get_text_size(text: str):
+def get_text_size(text: str) -> Tuple[int, int]:
    if not font:
-        raise Exception("Output image was not initialized! Make sure to call NSD_init first")
-    return font.getsize(text)
+        raise Exception(ERROR_TEXT)
+    size = font.getsize(text)

-def draw_debug_tile(x, y, x_sz, y_sz):
-    from random import randint
+    return (size[0]+PADDING_X, size[1]+PADDING_Y)

-    output_img.rectangle((x, y) + (x + x_sz, y + y_sz), fill=(randint(0, 255)))
-    return x, y + y_sz

-def draw_generic_instruction(instruction: str, x, y, xsize, ysize) -> Iterable[float]:
+
+def draw_debug_tile(x:int, y:int, width:int, height:int) -> int:
+    fill_color = (random.randint(0, 255),random.randint(0, 255), random.randint(0, 255))
+    output_img.rectangle((x,y) + (x+width, y+height), outline=(0), fill=fill_color)
+
+    return y + height
+
+def draw_generic_instruction(instruction: str, x: int, y: int, width:int, height:int) -> int:
    if not output_img:
-        raise Exception("Output image was not initialized! Make sure to call NSD_init first")
+        raise Exception(ERROR_TEXT)

    #draw shit
-    output_img.rectangle((x,y) + (x + xsize, y + ysize), outline=(0), width=1)
+    output_img.rectangle((x,y) + (x + width, y + height), outline=(0), width=1)

    #text shit
-    output_img.multiline_text((x + xsize * .5, y + ysize * .5), instruction, font=font, anchor="mm", align="right", fill=(0))
+    output_img.multiline_text((x + width * .5, y + height * .5), instruction, font=font, anchor="mm", align="right", fill=(0))

-    return x, y + ysize
+    return y + height

-def draw_if_statement(condition: str, x: int, y: int, true_w: int, false_w: int, ysize: int):
+
+
+def draw_if_statement(condition: str, x: int, y: int, true_width: int, block_width:int, block_height: int) -> Tuple[int, int, int, int]:
    """Draw an if statement into the NSD"""
    if not output_img:
-        raise Exception("Output image was not initialized! Make sure to call NSD_init first")
+        raise Exception(ERROR_TEXT)

-    text_sz = font.getsize(condition)
-    text_h = text_sz[1] + PADDING_Y
-    text_w = text_sz[0] + PADDING_X
+    text_height = get_text_size(condition)[1]

-    box_w = max(text_w, true_w + false_w)
+    #condition
+    output_img.rectangle((x, y) + (x + block_width, y + text_height), outline=(0), width=1) #Box around condition text
+    output_img.multiline_text((x + true_width, y + text_height / 2), condition, fill=(0), font=font, anchor="mm", spacing=4, align='right')

-    output_img.line((x,y) + (x + box_w/2, y + text_h), fill=(0))
-    output_img.line((x + box_w, y) + (x + box_w/2, y + text_h), fill=(0))
-    output_img.rectangle((x, y + text_h) + (x + box_w, y + ysize), outline=(0), width=1)
-    output_img.rectangle((x, y) + (x + box_w, y + text_h), outline=(0), width=1)
-    output_img.line((x + true_w, y + text_h) + (x + true_w, y + ysize), fill=(0))
+<<<<<<< HEAD
+    #fancy lines for the "true" and "false" labels
+    output_img.line((x,y) + (x + true_width, y + text_height), fill=(0))
+    output_img.line((x + block_width, y) + (x + true_width, y + text_height), fill=(0))
+    # "true" and "false" labels
+    output_img.text((x + 5, y + text_height), "true", font = font, fill = (0), anchor="ld")
+    output_img.text((x + block_width - 5, y + text_height), "false", font = font, fill = (0), anchor="rd")
+=======
+    output_img.line((x,y) + (x + true_sz, y + text_y_size), fill=(0))
+    output_img.line((x + box_sz, y) + (x + true_sz, y + text_y_size), fill=(0))
+    output_img.rectangle((x, y + text_y_size) + (x + box_sz, y + ysize), outline=(0), width=1)
+    output_img.rectangle((x, y) + (x + box_sz, y + text_y_size), outline=(0), width=1)
+    output_img.line((x + true_sz, y + text_y_size) + (x + true_sz, y + ysize), fill=(0))
+>>>>>>> main

-    # condition text
-    output_img.multiline_text((x + box_w / 2, y + text_h / 2), condition, fill=(0), font=font, anchor="mm", spacing=4, align='right')
+    output_img.line((x + true_width, y + text_height) + (x + true_width, y + block_height), fill=(0))

-    # true / false
-    output_img.text((x + 5, y + text_h), "true", font = font, fill = (0), anchor="ld")
-    output_img.text((x + box_w - 5, y + text_h), "false", font = font, fill = (0), anchor="rd")
+    #x and y of "true" and "false" label
+    return x, y + text_height, x + true_width, y + text_height

-    #x, and y of "true" and "false" label
-    return x, y + text_h, x + true_w, y + text_h
-
-def draw_while_loop_front(condition: str, x: int, y: int, xsize: int, ysize: int):
+def draw_while_loop_front(condition: str, x: int, y: int, block_width: int, block_height: int) -> Tuple[int, int, int]:

    if not output_img:
-        raise Exception("Output image was not initialized! Make sure to call NSD_init first")
+        raise Exception(ERROR_TEXT)

-    text_y_sz = font.getsize(condition)[1]
+    text_height = get_text_size(condition)[1]
+
+    block_offset = int(block_width * BLOCK_OFFSET_RATIO)

    #the box
-    output_img.line((x,y) + (x + xsize, y), fill=(0))
-    output_img.line((x,y) + (x, y + ysize), fill=(0))
-    output_img.line((x + xsize * .1, y + text_y_sz) + (x + xsize, y + text_y_sz), fill=(0))
-    output_img.line((x + xsize, y) + (x + xsize, y + text_y_sz), fill=(0))
-    output_img.line((x, y + ysize) + (x + xsize * .1, y + ysize ), fill=(0))
-    output_img.line((x + xsize * .1, y + ysize) + (x + xsize * .1, y + text_y_sz), fill=(0))
+    output_img.line((x,y) + (x + block_width, y), fill=(0))
+    output_img.line((x,y) + (x, y + block_height), fill=(0))
+    output_img.line((x + block_offset, y + text_height) + (x + block_width, y + text_height), fill=(0))
+    output_img.line((x + block_width, y) + (x + block_width, y+text_height), fill=(0))

    #the text
-    output_img.text((x + xsize * .1, y + text_y_sz * .5), condition, font = font, fill = (0), anchor="lm")
+    output_img.text((x + block_offset, y + text_height * .5), condition, font = font, fill = (0), anchor="lm")

-    #the x, y offset then the x,y draw size (the canvas)
-    return x + xsize * .1, y + text_y_sz, xsize * .9
+    #the x, y offset then the children width
+    return x + block_offset, y + text_height, block_width - block_offset

-def draw_while_loop_back(condition: str, x: int, y: int, xsize: int, ysize: int):
+def draw_while_loop_back(condition: str, x: int, y: int, block_width: int, block_height: int):

    if not output_img:
-        raise Exception("Output image was not initialized! Make sure to call NSD_init first")
+        raise Exception(ERROR_TEXT)

-    text_y_sz = get_text_size(condition)[1]
+    text_height = get_text_size(condition)[1]
+
+    block_offset = int(block_width * BLOCK_OFFSET_RATIO)

    #the box
-    output_img.line((x,y) + (x + xsize * .1, y), fill=0)
-    output_img.line((x + xsize * .1, y) + (x + xsize * .1, y + ysize - text_y_sz), fill=0)
-    output_img.line((x + xsize * .1, y + ysize - text_y_sz) + (x + xsize, y + ysize - text_y_sz), fill=0)
-    output_img.line((x + xsize, y + ysize - text_y_sz) + (x + xsize, y + ysize), fill=0)
-    output_img.line((x,y + ysize) + (x + xsize, y + ysize), fill=0)
-    output_img.line((x,y) + (x, y + ysize), fill=0)
+    output_img.line((x,y) + (x + block_offset, y), fill=0)
+    output_img.line((x + block_offset, y) + (x + block_offset, y + block_height - text_height), fill=0)
+    output_img.line((x + block_offset, y + block_height - text_height) + (x + block_width, y + block_height - text_height), fill=0)
+    output_img.line((x + block_width, y + block_height - text_height) + (x + block_width, y + block_height), fill=0)
+    output_img.line((x,y + block_height) + (x + block_width, y + block_height), fill=0)
+    output_img.line((x,y) + (x, y + block_height), fill=0)

    #the text
-    output_img.text((x + xsize * .1, y + ysize - text_y_sz * .5), condition, font = font, fill = (0), anchor="lm")
+    output_img.multiline_text((x + block_offset, y + block_height - text_height * .5), condition, font = font, fill = (0), anchor="lm")

-    #the x, y offset then the x,y draw size (the canvas)
-    return x + xsize * .1, y, xsize * .9
+    #x, y and width of children
+    return x + block_offset, y, block_width - block_offset

 def NSD_save(filepath: str):
    """Save the created file"""
-    filepath = filepath.removesuffix(".png")
+    filepath = filepath.removesuffix(datei_endung)
    img.save(filepath + datei_endung ,"PNG")
--- a/interpreter/Function_scope.py
+++ b/interpreter/Function_scope.py
@@ -0,0 +1,24 @@
+from typing import Iterable, List
+from draw.Iinstruction import Iinstruction
+
+class Function_scope(Iterable):
+    def __init__(self, child_instructions: List[Iinstruction], name: str, return_type: str, args: List[str]) -> None:
+        self.contents = child_instructions
+        self.name = name
+        self.return_type = return_type
+        self.args = args
+
+    def get_height(self) -> int:
+        h = 0.0
+        for inst in self.contents:
+            h += inst.getblkheight()
+        return int(h)
+
+    def get_width(self) -> int:
+        w = 200.0
+        for inst in self.contents:
+            w = max(w, inst.getblkwidth())
+        return int(w)
+
+    def __iter__(self):
+        return self.contents.__iter__()
--- a/interpreter/Lexer.py
+++ b/interpreter/Lexer.py
@@ -0,0 +1,403 @@
+"""Lexer.py: Definition for Lexer class"""
+from interpreter.Tokenizer import Tokenizer
+from os import linesep
+from draw.Iinstruction import *
+from typing import List, Optional, Union, Tuple
+import logging
+
+from interpreter.function_scope import Function_scope
+from interpreter._token import Token, Token_type
+from errors.custom import JavaSyntaxError
+
+def print_arr(arr):
+    print("[")
+    for elem in arr:
+        if isinstance(elem, List):
+            print_arr(elem)
+        else:
+            print(elem)
+    print("]")
+
+class Lexer:
+    def __init__(self, tokens: List[Token]) -> None:
+        self._tokens = tokens
+        self._token_index = 0
+
+        self._scopes: List[Function_scope] = []
+
+        #in case the tokenizer finds valid tokens in the global scope, they will be saved here
+        self._global_instructions = []
+
+    
+
+    def _peek(self, offset:int=0) -> Optional[Token]:
+        if (self._token_index+offset) >= len(self._tokens):
+            return None
+        return self._tokens[self._token_index+offset]
+
+    def _consume(self):
+        token = self._peek()
+        self._token_index+=1
+        return token
+
+
+    def get_instructions(self):
+
+        scopes = []
+
+        while self._peek():
+            line_tokens = self.get_line_tokens()
+
+            if self._is_function_def(line_tokens):
+
+                func_name, func_return_type, func_args = self._construct_function_header_from_tokens(line_tokens)
+                current_scope = Function_scope(func_name, func_return_type, func_args)
+
+                instructions = self._get_instructions_in_scope()
+                current_scope._add_instructions(instructions)
+
+                scopes.append(current_scope)
+
+            else:
+                #something was declared in global scope
+                self._global_instructions.append(self._construct_instruction_from_tokens(line_tokens))
+
+        self.add_globals_to_scope_list(scopes)
+        return scopes
+            
+    def _get_instructions_in_scope(self):
+
+        instructions = []
+
+        while self._peek():
+
+            line_tokens = self.get_line_tokens()
+            instruction = self._construct_instruction_from_tokens(line_tokens)
+            if instruction:
+                instructions.append(instruction)
+
+            delimiter_token = line_tokens[-1]
+            if delimiter_token.type == Token_type.RIGHT_CURLY:
+                return instructions
+
+        raise JavaSyntaxError(f"{self._peek(-1).location}: Missing right curly!")
+
+
+
+    def get_tokens_until(self, delimiter_types: List[Token_type]) -> List[Token]:
+        tokens = []
+        while token := self._consume():
+            tokens.append(token)
+            if token.type in delimiter_types:
+                break
+        return tokens
+
+    def get_line_tokens(self):
+        return self.get_tokens_until([Token_type.SEMICOLON, Token_type.LEFT_CURLY, Token_type.RIGHT_CURLY])
+
+    
+
+    def add_globals_to_scope_list(self, scope_list: List[Function_scope]):
+        global_scope = Function_scope("<Global scope>", "void", [])
+        global_scope._add_instructions(self._global_instructions)
+
+        scope_list.append(global_scope)
+
+
+    def _is_function_def(self, tokens: List[Token]) -> bool:
+        #if token list is of shape TYPE_NAME IDENTIFIER ( ... {
+        return tokens[0].type == Token_type.TYPE_NAME and tokens[1].type == Token_type.UNKNOWN and tokens[2].type == Token_type.LEFT_PAREN and tokens[-1].type == Token_type.LEFT_CURLY
+
+
+
+    def _construct_instruction_from_tokens(self, tokens: List[Token]):
+        instruction_token = tokens[0]
+
+        if instruction_token.type == Token_type.IF_STATEMENT:
+            return self._handle_if_construct(tokens)
+        
+        elif instruction_token.type == Token_type.WHILE_STATEMENT:
+            return self._handle_while_construct(tokens)
+            
+        elif instruction_token.type == Token_type.DO_WHILE_STATEMENT:
+            return self._handle_do_while_construct(tokens)
+        
+        elif instruction_token.type == Token_type.FOR_STATEMENT:
+            return self._handle_for_construct(tokens)
+        
+        elif instruction_token.type == Token_type.TYPE_NAME:
+            return self._handle_type_name_construct(tokens)
+
+        elif instruction_token.type == Token_type.UNKNOWN:
+            return self._handle_generic_construct(tokens)
+
+    def _construct_function_header_from_tokens(self, tokens: List[Token]) -> Tuple[str, str, List[str]]:
+
+        _ensure_correct_function_structure(tokens)
+
+        function_return_type = tokens[0].content
+
+        function_name = tokens[1].content
+
+        argument_list = _get_function_argument_list_from_tokens(tokens[3:-2])
+
+        return function_name, function_return_type, argument_list
+
+    def _construct_variable_def_from_tokens(self, tokens: List[Token]) -> str:
+        _ensure_correct_variable_structure(tokens)
+
+        variable_type = tokens[0].content
+        variable_name = tokens[1].content
+
+        if tokens[2].type == Token_type.SEMICOLON:
+            return f"declare variable '{variable_name}' of type {variable_type}"
+
+        variable_value = self._construct_source_line_from_tokens(tokens[3:])
+
+        return f"declare variable '{variable_name}' of type {variable_type} with value {variable_value}"
+
+    def _construct_source_line_from_tokens(self, tokens: List[Token]) -> str:
+        """TODO: make this function smarter"""
+        line = ""
+
+        for token in tokens:
+            if token.type == Token_type.SEMICOLON:
+                break
+            line += token.content + ' '
+
+        return line[:-1] #ignore the space after the last instruction text
+
+    """Handler functions for different types of language structures"""
+
+    def _handle_if_construct(self, tokens: List[Token]):
+        logging.debug("Found if construct")
+
+        _ensure_correct_if_structure(tokens)
+
+        condition_str = self._construct_source_line_from_tokens(tokens[2:-2])
+
+        true_case = self._get_instructions_in_scope()
+        false_case = self._handle_else_construct()
+
+        return if_instruction(condition_str, true_case, false_case)
+
+    def _handle_else_construct(self):
+        if self._peek().type == Token_type.ELSE_STATEMENT:
+            if self._peek(1).type == Token_type.IF_STATEMENT:
+                logging.debug("Found if-else construct")
+                else_if_tokens = self.get_line_tokens()[1:]
+                return [self._handle_if_construct(else_if_tokens)]
+            else:
+                logging.debug("Found else construct")
+                self.get_line_tokens()
+                return self._get_instructions_in_scope()
+        return None
+
+    def _handle_while_construct(self, tokens: List[Token]):
+        logging.debug("Found while construct")
+
+        _ensure_correct_while_structure(tokens)
+
+        condtion_str = self._construct_source_line_from_tokens(tokens[2:-2])
+        
+        loop_instructions = self._get_instructions_in_scope()
+
+        return while_instruction_front(condtion_str, loop_instructions)
+
+    def _handle_do_while_construct(self, tokens: List[Token]):
+        logging.debug("Found do-while construct")
+
+        _ensure_correct_do_while_structure_part_1(tokens)
+
+
+        loop_instructions = self._get_instructions_in_scope()
+
+
+        while_tokens = self.get_line_tokens()
+        _ensure_correct_do_while_structure_part_2(while_tokens)
+        condtion_str = self._construct_source_line_from_tokens(while_tokens[2:-2])
+
+        return while_instruction_back(condtion_str, loop_instructions)
+
+    def _handle_for_construct(self, tokens: List[Token]):
+        logging.debug("Found for construct")
+        tokens.extend(self.get_tokens_until([Token_type.LEFT_CURLY]))
+
+        _ensure_correct_for_structure(tokens)
+
+        variable_tokens, condition_tokens, increment_tokens = _get_for_arguments_from_tokens(tokens[2:])
+        
+        variable_str = ""
+        if len(variable_tokens) > 1: #if we got more than just a semicolon
+            variable_str = self._construct_variable_def_from_tokens(variable_tokens)
+
+        condition_str = "true"
+        if condition_tokens:
+            condition_str = self._construct_source_line_from_tokens(condition_tokens)
+
+        increment_instruction = None
+        if increment_tokens:
+            increment_instruction = generic_instruction(self._construct_source_line_from_tokens(increment_tokens))
+
+        loop_instructions = self._get_instructions_in_scope()
+
+        if increment_instruction:
+            loop_instructions.append(increment_instruction)
+
+        return for_instruction(variable_str, condition_str, loop_instructions)
+
+    def _handle_type_name_construct(self, tokens: List[Token]):
+        logging.debug("Found Type name construct")
+        
+        return generic_instruction(self._construct_variable_def_from_tokens(tokens))
+
+    def _handle_generic_construct(self, tokens: List[Token]):
+        logging.debug("Found generic instruction")
+
+        return generic_instruction(self._construct_source_line_from_tokens(tokens))
+
+
+
+def _ensure_correct_function_structure(tokens: List[Token]):
+    #function structure: TYPE_NAME IDENTIFIER ( ... ) {
+    if len(tokens) < 5:
+        raise JavaSyntaxError(f"{tokens[0].location}: Ill-formed function declaration! Expected at least 5 tokens, got {len(tokens)}")
+    if tokens[-1].type != Token_type.LEFT_CURLY:
+        raise JavaSyntaxError(f"{tokens[-1].location}: Ill-formed function declaration! Expected last token to be LEFT_CURLY, got {str(tokens[-1].type)}")
+    if tokens[1].type != Token_type.UNKNOWN:
+        raise JavaSyntaxError(f"{tokens[1].location}: Illegal token after function return type! Expected UNKNWON, got {str(tokens[1].type)}")
+    if tokens[2].type != Token_type.LEFT_PAREN:
+        raise JavaSyntaxError(f"{tokens[2].location}: Illegal token after funtion name! Expected LEFT_CURLY, got {str(tokens[2].type)}")
+    if tokens[-2].type != Token_type.RIGTH_PAREN:
+        raise JavaSyntaxError(f"{tokens[-2].location}: Illegal token after function parameter list! Expected RIGHT_PAREN, got {str(tokens[-2].type)}")
+
+def _ensure_correct_variable_structure(tokens: List[Token]):
+    #variable structure: TYPE_NAME IDENTIFIER ;|( = EXPRESSION;)
+    if len(tokens) < 3:
+        raise JavaSyntaxError(f"{tokens[0].location}: Ill-formed type construct! Expected at least 3 tokens, got {len(tokens)}")
+    if tokens[1].type != Token_type.UNKNOWN:
+        raise JavaSyntaxError(f"{tokens[1].location}: Illegal token after type name! Expected UNKNOWN, got {str(tokens[1].type)}")
+    if not tokens[2].type in [Token_type.SEMICOLON, Token_type.EQUAL_SIGN]:
+        raise JavaSyntaxError(f"{tokens[2].location}: Illegal token after variable name! Expected SEMICOLON or EQUAL_SIGN, got {str(tokens[2].type)}")
+    if tokens[2].type == Token_type.EQUAL_SIGN and len(tokens) < 5:
+        raise JavaSyntaxError(f"{tokens[2].location}: Ill-formed assignment expression! Expected at least 5 tokens, got {len(tokens)}")
+
+def _ensure_correct_if_structure(tokens: List[Token]):
+    #if structure: IF ( ... ) {  <-- the opening curly is technically not needed, but we require it anyways
+    if len(tokens) < 5:
+        raise JavaSyntaxError(f"{tokens[0].location}: Ill-formed if construct! Expected at least 5 tokens, got {len(tokens)}")
+    if tokens[-1].type != Token_type.LEFT_CURLY:
+        raise JavaSyntaxError(f"{tokens[-1].location}: Ill-formed if construct! Expected last token to be LEFT_CURLY, got {str(tokens[-1].type)}")
+    if tokens[1].type != Token_type.LEFT_PAREN:
+        raise JavaSyntaxError(f"{tokens[1].location}: Illegal token after if token! Expected LEFT_PAREN, got {str(tokens[1].type)}")
+    if tokens[-2].type != Token_type.RIGTH_PAREN:
+        raise JavaSyntaxError(f"{tokens[-2].location}: Illegal token after conditional expression! Expected RIGHT_PAREN, got {str(tokens[-2].type)}")
+
+def _ensure_correct_while_structure(tokens: List[Token]):
+    #while structure: WHILE ( ... ) { <-- might not be required by the standard, but is required by us
+    if len(tokens) < 5:
+        raise JavaSyntaxError(f"{tokens[0].location}: Ill-formed while construct! Expected at least 5 tokens, got {len(tokens)}")
+    if tokens[-1].type != Token_type.LEFT_CURLY:
+        raise JavaSyntaxError(f"{tokens[-1].location}: Ill-formed while construct! Expected last token to be LEFT_CURLY, got {str(tokens[-1].type)}")
+    if tokens[1].type != Token_type.LEFT_PAREN:
+        raise JavaSyntaxError(f"{tokens[1].location}: Illegal token after while token! Expected LEFT_PAREN, got {str(tokens[1].type)}")
+    if tokens[-2].type != Token_type.RIGTH_PAREN:
+        raise JavaSyntaxError(f"{tokens[-2].location}: Illegal token after while condition! Expected RIGHT_PAREN, got {str(tokens[-2].type)}")
+
+def _ensure_correct_do_while_structure_part_1(tokens: List[Token]):
+    #do-while structure: do{
+    if len(tokens) != 2:
+        raise JavaSyntaxError(f"{tokens[0].location}: Ill-formed do-while construct! Expected 2 tokens, got {len(tokens)}")
+    if tokens[1].type != Token_type.LEFT_CURLY:
+        raise JavaSyntaxError(f"Illegal token after do token! Expected LEFT_CURLY, got {str(tokens[1].type)}")
+
+def _ensure_correct_do_while_structure_part_2(tokens: List[Token]):
+    #do-while structure: while( ... );
+    if len(tokens) < 5:
+        raise JavaSyntaxError(f"{tokens[0].location}: Ill-formed do while contruct! Expected at least 5 tokens, got {len(tokens)}")
+    if tokens[0].type != Token_type.WHILE_STATEMENT:
+        raise JavaSyntaxError(f"{tokens[0].location}: Illegal token after do block! Expected WHILE_STATEMENT, got {str(tokens[1].type)}")
+    if tokens[-1].type != Token_type.SEMICOLON:
+        raise JavaSyntaxError(f"{tokens[-1].location}: Ill-formed do-while construct! Expected last token to be SEMICOLON, got {str(tokens[-1].type)}")
+    if tokens[1].type != Token_type.LEFT_PAREN:
+        raise JavaSyntaxError(f"{tokens[1].location}: Illegal token after while token! Expected LEFT_PAREN, got {str(tokens[1].type)}")
+    if tokens[-2].type != Token_type.RIGTH_PAREN:
+        raise JavaSyntaxError(f"{tokens[-2].location}: Illegal token after do-while condition! Expected RIGHT_PAREN, got {str(tokens[-2].type)}")
+
+def _ensure_correct_for_structure(tokens: List[Token]):
+    #for structure: for(...?;...?;...?) {
+    if len(tokens) < 6:
+        raise JavaSyntaxError(f"{tokens[0].location}: Illf-formed for loop construct! Expected at least 6 tokens, got {len(tokens)}")
+    if tokens[-1].type != Token_type.LEFT_CURLY:
+        raise JavaSyntaxError(f"{tokens[-1].location}: Ill-formed for loop construct! Expected last token to be LEFT_CURLY, got {str(tokens[-1].type)}")
+    if tokens[1].type != Token_type.LEFT_PAREN:
+        raise JavaSyntaxError(f"{tokens[1].location}: Illegal token after for token! Expected LEFT_PAREN, got {str(tokens[1].type)}")
+    if tokens[-2].type != Token_type.RIGTH_PAREN:
+        raise JavaSyntaxError(f"{tokens[-2].location}: Illegal token after for loop increment! Expected RIGHT_PAREN, got {str(tokens[-2].type)}")
+    if ( semicolon_count := tokens.count(Token(Token_type.SEMICOLON)) ) != 2:
+        raise JavaSyntaxError(f"Ill-formed for loop construct! Expected exactly 2 SEMICOLON tokens, got {semicolon_count}")
+
+
+
+def _get_function_argument_list_from_tokens(tokens: List[Token]) -> List[str]:
+    arg_tokens = _get_seperated_token_list(tokens, [Token_type.COMMA])
+
+    args = []
+    
+    for arg in arg_tokens:
+        arg_str = ""
+        for token in arg:
+            arg_str += token.content + ' '
+        arg_str = arg_str[:-1]
+        args.append(arg_str)
+
+    return args
+
+def _get_seperated_token_list(tokens: List[Token], seperator_types: List[Token_type]) -> List[List[Token]]:
+    token_segments = []
+    tokens_in_segment = []
+
+    for token in tokens:
+        if token.type in seperator_types:
+            token_segments.append(tokens_in_segment)
+            tokens_in_segment = []
+            continue
+        tokens_in_segment.append(token)
+
+    token_segments.append(tokens_in_segment)
+
+    return token_segments
+
+
+def _get_for_arguments_from_tokens(tokens: List[Token]) -> Tuple[List[Token], List[Token],  List[Token]]:
+    variable_tokens = []
+    condition_tokens = []
+    increment_tokens = []
+
+    token_index = 0
+
+    while True:
+        token = tokens[token_index]
+        token_index += 1
+
+        variable_tokens.append(token)
+        if token.type == Token_type.SEMICOLON:
+            break
+    
+    while True:
+        token = tokens[token_index]
+        token_index += 1
+
+        if token.type == Token_type.SEMICOLON:
+            break
+        condition_tokens.append(token)
+
+    while True:
+        token = tokens[token_index]
+        token_index += 1
+
+        if token.type == Token_type.LEFT_CURLY:
+            break
+        increment_tokens.append(token)
+
+    return variable_tokens, condition_tokens, increment_tokens[:-1]
--- a/interpreter/NassiShneidermann.py
+++ b/interpreter/NassiShneidermann.py
@@ -10,7 +10,8 @@ from enum import IntEnum
 import os.path
 import secrets

-from interpreter.interpret_source import JavaInterpreter
+from interpreter.Tokenizer import Tokenizer
+from interpreter.Lexer import Lexer
 from interpreter.function_scope import Function_scope
 from draw.code_to_image_wrapper import NSD_writer
 import draw.code_to_image as cti
@@ -38,12 +39,13 @@ class NassiShneidermanDiagram:

    @staticmethod
    def _save_scope(scope: Function_scope, output_path: str):
-        y_size = scope.get_height()
-        x_size = scope.get_width()
-        with NSD_writer(output_path, x_size, y_size):
-            x, y = 0, 0
-            for instruction in scope:
-                x, y = instruction.to_image(x, y, x_size)
+        width = scope.get_width()
+        height = scope.get_height()
+        with NSD_writer(output_path, width, height):
+            y = 0
+            for instruction in scope:   
+                print(instruction.instruction_text)
+                y = instruction.convert_to_image(0, y, width)

    @staticmethod
    def check_conflicts(filepath:str, behavoiur: Overwrite_behaviour):
@@ -64,6 +66,7 @@ class NassiShneidermanDiagram:

            filepath = f"{output_path}/{scope.name}"
            filepath = self.check_conflicts(filepath, on_conflict)
+
            if filepath is not None:
                logging.info(f"Saving NSD to {filepath}.png...")

@@ -81,9 +84,14 @@ class NassiShneidermanDiagram:
            i+=1
            
    def load_from_file(self, filepath:str, itp_custom_tags: Optional[Dict[str, List[str]]]):
-        itp = JavaInterpreter(filepath)
-        itp.reset_tags(itp_custom_tags)
-        self.function_scopes = itp.load_instruction_scopes()
+
+        tokenizer = Tokenizer(filepath)
+
+        tokens = tokenizer.get_tokens()
+
+        lexer = Lexer(tokens)
+
+        self.function_scopes = lexer.get_instructions()[:-1]
        
        if not self.function_scopes:
            return True
--- a/interpreter/Tokenizer.py
+++ b/interpreter/Tokenizer.py
@@ -0,0 +1,112 @@
+"""Tokenizer.py: Definition for Tokenizer class"""
+
+from errors.custom import JavaSyntaxError
+import logging
+import re
+from typing import List, Optional
+
+from interpreter._token import Token, make_token, SourceLocation
+
+class Tokenizer:
+    """This class will take the provided source file and convert it to a list of tokens"""
+
+    TOKEN_MATCH = re.compile(r"""\(|\)|\{|\}|;|(\n)|\+|-|\*|/|<|>|,| """)
+
+    def __init__(self, file_name: str) -> None:
+        with open(file_name) as f:
+            self.source_text = f.read()
+        self.source_index = 0
+        self.line_number = 1
+        self.column_number = 0
+
+        self.source_text = re.sub("(private)|(public)|(protected)|(final)", "", self.source_text)
+
+        self.type_name_pattern = re.compile('(char)|(int)|(void)|(double)|(boolean)|(Pixel)|(String)') #TODO: make this modular
+
+        self._filename = file_name
+
+        self._left_curly_number=0
+        self._right_curly_number=0
+
+    def get_tokens(self) -> List[Token]:
+
+        tokens = []
+
+        while char := self._consume():
+
+            if char.isspace():
+                continue
+
+            if self._handle_comments(char):
+                continue
+
+            tag = self._get_token(char)
+            logging.debug(f"found tag \"{tag}\" on line {self.line_number}")
+
+            if tag == "{":
+                self._left_curly_number+=1
+            elif tag == "}":
+                self._right_curly_number+=1
+
+            tokens.append(make_token(tag, SourceLocation(self._filename, self.line_number, self.column_number), self.type_name_pattern))
+
+        if self._left_curly_number != self._right_curly_number:
+            raise JavaSyntaxError(f"Ill-formed Java program! Expected equal number of '{'{'}' and '{'}'}' tokens, got {self._left_curly_number} and {self._right_curly_number}")
+
+        return tokens
+
+    def _get_token(self, char: str) -> str:
+        token = char
+
+        if not re.match(Tokenizer.TOKEN_MATCH, token):
+
+            while (token_char := self._peek()):
+                if re.match(Tokenizer.TOKEN_MATCH, token_char):
+                    break
+                token += self._consume()
+
+        return token
+
+    def _handle_comments(self, char: str) -> bool:
+        if char == '/' and self._peek() == '/':
+            self._get_line() #skip the entire line
+            return True
+        elif char == '/' and self._peek() == '*':
+            self._consume()
+            self._consume_multiline_comment()
+            return True
+        return False
+
+    def _get_line(self) -> str:
+        return self._consume_until('\n')
+
+    def _peek(self, offset:int = 0) -> str:
+        if (self.source_index + offset) >= len(self.source_text):
+            return ''
+        char = self.source_text[self.source_index]
+        
+        return char
+
+    def _consume(self) -> str:
+        char = self._peek()
+
+        if char == '\n':
+            self.line_number += 1
+            self.column_number = 1
+
+        self.source_index += 1
+        self.column_number += 1
+        return char
+
+    def _consume_multiline_comment(self):
+        while self._peek():
+            if self._consume() == '*' and self._peek() == '/':
+                self._consume()
+                break
+
+    def _consume_until(self, end_tag: str) -> str:
+        res = ""
+        while self._peek() and (char:= self._consume()) != end_tag:
+            res += char
+        
+        return res
--- a/interpreter/_token.py
+++ b/interpreter/_token.py
@@ -0,0 +1,91 @@
+"""Private definitions for Token class used by the Lexer"""
+
+import re
+from dataclasses import dataclass, field
+from enum import IntEnum
+from typing import Union
+
+NUMERIC_CONSTANT_PATTERN = re.compile(r"""([0-9]+)|(true)|(false)""")
+KEYWORD_PATTERN = re.compile(r"""(return)$|(continue)$|(break)$|(new)$""")
+STRING_LITERAL_PATTERN = re.compile(r"""('|\")(.*)(\"|')""")
+MATH_OP_PATTERN = re.compile(r"""\+|-|\*|/|<|>""")
+
+class Token_type(IntEnum):
+    UNKNOWN=-1 #maybe this should be renamed to IDENTIFIER
+    LEFT_PAREN=0,
+    RIGTH_PAREN=1,
+    LEFT_CURLY=2,
+    RIGHT_CURLY=3,
+    LEFT_BRACKET=4,
+    RIGHT_BRACKET=5,
+    COMMA=6,
+    EQUAL_SIGN=7,
+    SEMICOLON=8
+    MATH_OP=9
+    NUMERIC_CONSTANT=10,
+    IF_STATEMENT=11,
+    ELSE_STATEMENT=12,
+    WHILE_STATEMENT=13,
+    DO_WHILE_STATEMENT=14,
+    FOR_STATEMENT=15,
+    KEY_WORD=16,
+    STRING_LITERAL=17
+    TYPE_NAME=18
+
+@dataclass(frozen=True)
+class SourceLocation:
+    file: str
+    line: int
+    column: int
+
+    def __str__(self) -> str:
+        return f"File {self.file} {self.line}:{self.column}"
+
+@dataclass(frozen=True, eq=True)
+class Token:
+    type: Token_type
+    location: SourceLocation = field(compare=False, default=SourceLocation("", 0, 0))
+    content: str = field(compare=False, default="")
+
+def make_token(tag: str, location: SourceLocation, type_name_pattern:re.Pattern) -> Token:
+    """Construct a token object with the provided tag and source location"""
+    if tag == '(':
+        return Token(Token_type.LEFT_PAREN, location, tag)
+    elif tag == ')':
+        return Token(Token_type.RIGTH_PAREN, location, tag)
+    elif tag == '{':
+        return Token(Token_type.LEFT_CURLY, location, tag)
+    elif tag == '}':
+        return Token(Token_type.RIGHT_CURLY, location, tag)
+    elif tag == '[':
+        return Token(Token_type.LEFT_BRACKET, location, tag)
+    elif tag == ']':
+        return Token(Token_type.RIGHT_BRACKET, location, tag)
+    elif tag == ',':
+        return Token(Token_type.COMMA, location, tag)
+    elif tag == '=':
+        return Token(Token_type.EQUAL_SIGN, location, tag)
+    elif tag == ';':
+        return Token(Token_type.SEMICOLON, location, tag)
+    elif MATH_OP_PATTERN.match(tag):
+        return Token(Token_type.MATH_OP, location, tag)
+    elif NUMERIC_CONSTANT_PATTERN.match(tag):
+        return Token(Token_type.NUMERIC_CONSTANT, location, tag)
+    elif tag == "if":
+        return Token(Token_type.IF_STATEMENT, location, tag)
+    elif tag == "else":
+        return Token(Token_type.ELSE_STATEMENT, location, tag)
+    elif tag == "while":
+        return Token(Token_type.WHILE_STATEMENT, location, tag)
+    elif tag == "do":
+        return Token(Token_type.DO_WHILE_STATEMENT, location, tag)
+    elif tag == "for":
+        return Token(Token_type.FOR_STATEMENT, location, tag)
+    elif KEYWORD_PATTERN.match(tag):
+        return Token(Token_type.KEY_WORD, location, tag)
+    elif STRING_LITERAL_PATTERN.match(tag):
+        return Token(Token_type.STRING_LITERAL, location, tag)
+    elif type_name_pattern.match(tag):
+        return Token(Token_type.TYPE_NAME, location, tag)
+    else:
+        return Token(Token_type.UNKNOWN, location, tag)
--- a/interpreter/function_scope.py
+++ b/interpreter/function_scope.py
@@ -1,29 +1,36 @@
-"""function_scope.py: #TODO"""
+"""function_scope.py: Class for Function scopes"""

 __author__      = "Weckyy702"

 from typing import Iterable, List
-from draw.Iinstruction import Iinstruction
-
+from draw.Iinstruction import instruction

 class Function_scope(Iterable):
-    def __init__(self, child_instructions: List[Iinstruction], name: str, return_type: str, args: List[str]) -> None:
-        self.contents = child_instructions
+    """This class serves as a container for Instructions"""
+
+    def __init__(self, name: str, return_type: str, args: List[str]) -> None:
+        self.contents = []
        self.name = name
        self.return_type = return_type
        self.args = args

    def get_height(self) -> int:
-        h = 0.0
+        h = 0
        for inst in self.contents:
-            h += inst.getblkheight()
-        return int(h)
+            h += inst.get_block_height()
+        return max(h, 5) #a NSD has to be at least 5 pixels tall

    def get_width(self) -> int:
-        w = 200.0 #minimum width for every block
+        w = 200 #minimum width for every block
        for inst in self.contents:
-            w = max(w, inst.getblkwidth())
-        return int(w)
+            w = max(w, inst.get_block_width())
+        return w
+
+    def _add_instruction(self, inst: instruction):
+        self.contents.append(inst)
+
+    def _add_instructions(self, inst: List[instruction]):
+        self.contents.extend(inst)

    def __iter__(self):
        return self.contents.__iter__()
--- a/interpreter/interpret_source.py
+++ b/interpreter/interpret_source.py
@@ -10,7 +10,11 @@ from typing import Dict, List, Match, Tuple, Union, Iterable

 from errors.custom import InterpreterException, JavaSyntaxError, ScopeNotFoundException
 from draw.Iinstruction import *
+<<<<<<< HEAD
 from interpreter.function_scope import *
+=======
+from interpreter.Function_scope import Function_scope
+>>>>>>> main

 logging.warning("""Because the Interpreter is still WIP, some Java language features are not supported. These include:
    *foreach loops (will throw JavaSyntaxError)
@@ -211,7 +215,7 @@ class JavaInterpreter:
            return generic_instruction(f"declare variable '{var_name}' of type {var_type}"), idx
        return generic_instruction(f"declare variable '{var_name}' of type {var_type} with value {var_value}"), idx

-    def _handle_instruction(self, line: str, idx:int) -> Tuple[Union[Iinstruction, List[Iinstruction]], int]:
+    def _handle_instruction(self, line: str, idx:int) -> Tuple[Union[instruction, List[instruction]], int]:
        if line.startswith("while("):
            logging.debug("Found while construct in line: %i", idx+1)
            return self._handle_while(line, idx)
@@ -236,8 +240,8 @@ class JavaInterpreter:
            logging.debug("Found generic instruction in line %i", idx+1)
            return generic_instruction(line), idx

-    def _get_instructions_in_scope(self, idx: int=0) -> Tuple[List[Iinstruction], int]:
-        scope: List[Iinstruction] = []
+    def _get_instructions_in_scope(self, idx: int=0) -> Tuple[List[instruction], int]:
+        scope: List[instruction] = []
        i = idx
        while i < len(self._lines):
            line = self._lines[i]
@@ -267,7 +271,7 @@ class JavaInterpreter:
        fname = groups["name"]
        return ftype, fname, fargs

-    def _get_function_instructions(self, function_header: str) -> List[Iinstruction]:
+    def _get_function_instructions(self, function_header: str) -> List[instruction]:
        idx = self._lines.index(function_header)
        brace_offset = self._get_scope_start_offset(idx)
        return self._get_instructions_in_scope(idx+brace_offset)[0]
--- a/requirements.txt
+++ b/requirements.txt
@@ -0,0 +1 @@
+PySimpleGUI
--- a/res/input/input.java
+++ b/res/input/input.java
@@ -329,52 +329,6 @@
 //         final int value;
 //     };
 // }
-
-class Testing {
-
-    public void test_function() {
-        int rot = getRotation();
-
-        //if (richtung=="vorne" && rot==0 || richtung=="rechts" && rot==270 || richtung=="links" && rot==90)
-        //{
-            if(getOneObjectAtOffset(1,0,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(1,0,Huegel.class)).getSteigung() >30)
-            {
-                return true;
-            }
-        //}
-
-        //if (richtung=="vorne" && rot==180 || richtung=="rechts" && rot==90 || richtung=="links" && rot==270)
-        //{
-            // if(getOneObjectAtOffset(-1,0,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(-1,0,Huegel.class)).getSteigung() >30)
-            // {
-            //     return true;
-            // }
-        //}
-
-        // if (richtung=="vorne" && rot==90 || richtung=="rechts" && rot==0 || richtung=="links" && rot==180)
-        // {
-        //     if(getOneObjectAtOffset(0,1,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(0,1,Huegel.class)).getSteigung() >30)
-        //     {
-        //         return true;
-        //     }
-
-        // }
-
-        // if (richtung=="vorne" && rot==270 || richtung=="rechts" && rot==180 || richtung=="links" && rot==0)
-        // {
-        //     if(getOneObjectAtOffset(0,-1,Huegel.class)!=null && ((Huegel)getOneObjectAtOffset(0,-1,Huegel.class)).getSteigung() >30)
-        //     {
-        //         return true;
-        //     }
-
-        // }
-
-        // if(richtung!="vorne" && richtung!="links" && richtung!="rechts")
-        // {
-        //     nachricht("Befehl nicht korrekt!");
-        // }
-
-        // return false;
-    }
-
+void function() {
+    print(12);
 }
--- a/res/input/input_parsed.java
+++ b/res/input/input_parsed.java
@@ -1,281 +0,0 @@
-importgreenfoot.*;//(World,Actor,GreenfootImage,GreenfootandMouseInfo)
-classRoverextendsActor
-{
-Displayanzeige;
-/**
-*thisfunctionistobeimplementedbytheuser
-*dependingontheneededactions
-*/
-voidact()
-{
-S66Nr3(7);
-}
-voidfahreUmHuegel(Stringrichtung)
-{
-Stringpri;
-Stringsec;
-if(richtung.equals("Hoch")){
-pri="links";
-sec="rechts";
-}else{
-if(richtung.equals("Runter")){
-pri="rechts";
-sec="links";
-}else{
-nachricht("JUNGEDUSPAST!");
-return;
-}
-}
-drehe(pri);
-fahre();
-drehe(sec);
-fahre();
-fahre();
-drehe(sec);
-fahre();
-drehe(pri);
-}
-voidfahreBisHuegel()
-{
-while(!huegelVorhanden("vorne"))
-{
-fahre();
-}
-}
-voidfahreZeileDreheHoch()
-{
-fahreBisHuegel();
-fahreUmHuegel("Hoch");
-fahreBisHuegel();
-drehe("um");
-fahreBisHuegel();
-fahreUmHuegel("Runter");
-fahreBisHuegel();
-drehe("rechts");
-fahre();
-drehe("rechts");
-}
-voidfahreZeileDreheRunter(booleangeheInNächsteZeile)
-{
-fahreBisHuegel();
-fahreUmHuegel("Runter");
-fahreBisHuegel();
-drehe("um");
-fahreBisHuegel();
-fahreUmHuegel("Hoch");
-fahreBisHuegel();
-if(geheInNächsteZeile){
-drehe("rechts");
-fahre();
-drehe("rechts");
-}else{
-drehe("um");
-}
-}
-voidS66Nr3(intanzahlZeilen)
-{
-if(anzahlZeilen<3){
-nachricht("IchmussmindestensdreiZeilenfahren!:(");
-return;
-}
-fahreZeileDreheHoch();
-for(inti=1;i<anzahlZeilen-1;i++){
-fahreZeileDreheRunter(true);
-}
-fahreZeileDreheRunter(false);
-}
-/**
-*DerRoverbewegtsicheinFeldinFahrtrichtungweiter.
-*SolltesichinFahrtrichtungeinObjektderKlasseHuegelbefindenoderersichanderGrenzederWeltbefinden,
-*dannerscheinteineentsprechendeMeldungaufdemDisplay.
-*/
-voidfahre()
-{
-intposX=getX();
-intposY=getY();
-if(huegelVorhanden("vorne"))
-{
-nachricht("Zusteil!");
-}
-elseif(getRotation()==270&&getY()==1)
-{
-nachricht("Ichkannmichnichtbewegen");
-}
-else
-{
-move(1);
-Greenfoot.delay(1);
-}
-if(posX==getX()&&posY==getY()&&!huegelVorhanden("vorne"))
-{
-nachricht("Ichkannmichnichtbewegen");
-}
-}
-/**
-*DerRoverdrehtsichum90GradindieRichtung,diemitrichtung(ï¿œlinksï¿œoderï¿œrechtsï¿œ)ï¿œbergebenwurde.
-*SollteeinandererText(String)als"rechts"oder"links"ï¿œbergebenwerden,dannerscheinteineentsprechendeMeldungaufdemDisplay.
-*/
-voiddrehe(Stringrichtung)
-{
-if(richtung.equals("rechts")){
-setRotation(getRotation()+90);
-}elseif(richtung.equals("links")){
-setRotation(getRotation()-90);
-}elseif(richtung.equals("um")){
-setRotation(getRotation()+180);
-}else{
-nachricht("KeinenKorrekteRichtunggegeben!");
-}
-}
-/**
-*DerRovergibtdurcheinenWahrheitswert(trueoderfalse)zurï¿œck,obsichaufseinerPositioneinObjektderKlasseGesteinbefindet.
-*EineentsprechendeMeldungerscheintauchaufdemDisplay.
-*/
-booleangesteinVorhanden()
-{
-if(getOneIntersectingObject(Gestein.class)!=null)
-{
-nachricht("Gesteingefunden!");
-returntrue;
-}
-returnfalse;
-}
-/**
-*DerRoverï¿œberprï¿œft,obsichinrichtung("rechts","links",oder"vorne")einObjektderKlasseHuegelbefindet.
-*DasErgebniswirdaufdemDisplayangezeigt.
-*SollteeinandererText(String)als"rechts","links"oder"vorne"ï¿œbergebenwerden,dannerscheinteineentsprechendeMeldungaufdemDisplay.
-*/
-booleanhuegelVorhanden(Stringrichtung)
-{
-introt=getRotation();
-if(richtung=="vorne"&&rot==0||richtung=="rechts"&&rot==270||richtung=="links"&&rot==90)
-{
-if(getOneObjectAtOffset(1,0,Huegel.class)!=null&&((Huegel)getOneObjectAtOffset(1,0,Huegel.class)).getSteigung()>30)
-{
-returntrue;
-}
-}
-if(richtung=="vorne"&&rot==180||richtung=="rechts"&&rot==90||richtung=="links"&&rot==270)
-{
-if(getOneObjectAtOffset(-1,0,Huegel.class)!=null&&((Huegel)getOneObjectAtOffset(-1,0,Huegel.class)).getSteigung()>30)
-{
-returntrue;
-}
-}
-if(richtung=="vorne"&&rot==90||richtung=="rechts"&&rot==0||richtung=="links"&&rot==180)
-{
-if(getOneObjectAtOffset(0,1,Huegel.class)!=null&&((Huegel)getOneObjectAtOffset(0,1,Huegel.class)).getSteigung()>30)
-{
-returntrue;
-}
-}
-if(richtung=="vorne"&&rot==270||richtung=="rechts"&&rot==180||richtung=="links"&&rot==0)
-{
-if(getOneObjectAtOffset(0,-1,Huegel.class)!=null&&((Huegel)getOneObjectAtOffset(0,-1,Huegel.class)).getSteigung()>30)
-{
-returntrue;
-}
-}
-if(richtung!="vorne"&&richtung!="links"&&richtung!="rechts")
-{
-nachricht("Befehlnichtkorrekt!");
-}
-returnfalse;
-}
-/**
-*DerRoverermitteltdenWassergehaltdesGesteinsaufseinerPositionundgibtdiesenaufdemDisplayaus.
-*SolltekeinObjektderKlasseGesteinvorhandensein,dannerscheinteineentsprechendeMeldungaufdemDisplay.
-*/
-voidanalysiereGestein()
-{
-if(gesteinVorhanden())
-{
-nachricht("Gesteinuntersucht!Wassergehaltist"+((Gestein)getOneIntersectingObject(Gestein.class)).getWassergehalt()+"%.");
-Greenfoot.delay(1);
-removeTouching(Gestein.class);
-}
-else
-{
-nachricht("HieristkeinGestein");
-}
-}
-/**
-*DerRovererzeugteinObjektderKlasseï¿œMarkierungï¿œaufseinerPosition.
-*/
-voidsetzeMarke()
-{
-getWorld().addObject(newMarke(),getX(),getY());
-}
-/**
-**DerRovergibtdurcheinenWahrheitswert(trueoderfalse)zurï¿œck,obsichaufseinerPositioneinObjektderMarkebefindet.
-*EineentsprechendeMeldungerscheintauchaufdemDisplay.
-*/
-booleanmarkeVorhanden()
-{
-if(getOneIntersectingObject(Marke.class)!=null)
-{
-returntrue;
-}
-returnfalse;
-}
-voidentferneMarke()
-{
-if(markeVorhanden())
-{
-removeTouching(Marke.class);
-}
-}
-voidnachricht(StringpText)
-{
-if(anzeige!=null)
-{
-anzeige.anzeigen(pText);
-Greenfoot.delay(1);
-anzeige.loeschen();
-}
-}
-voiddisplayAusschalten()
-{
-getWorld().removeObject(anzeige);
-}
-voidaddedToWorld(Worldworld)
-{
-setImage("images/rover.png");
-world=getWorld();
-anzeige=newDisplay();
-anzeige.setImage("images/nachricht.png");
-world.addObject(anzeige,7,0);
-if(getY()==0)
-{
-setLocation(getX(),1);
-}
-anzeige.anzeigen("Ichbinbereit");
-}
-classDisplayextendsActor
-{
-GreenfootImagebild;
-Display()
-{
-bild=getImage();
-}
-voidact()
-{
-}
-voidanzeigen(StringpText)
-{
-loeschen();
-getImage().drawImage(newGreenfootImage(pText,25,Color.BLACK,newColor(0,0,0,0)),10,10);
-}
-voidloeschen()
-{
-getImage().clear();
-setImage("images/nachricht.png");
-}
-}
-classDirection{
-Direction(intval){
-this.value=val;
-}
-intvalue;
-};
-}
Author	SHA1	Message	Date
Weckyy702	13eb260af7	Merge pull request #2 from plexx-dev/0.3-A 0.3 a	2023-03-20 08:43:24 +00:00
plexx	e63bb0b367	merge into main	2023-03-20 01:47:39 +01:00
oleting	aa855c64ba	+ requirements.txt ~ readme	2023-03-19 10:03:18 +01:00
plexx	01387c8065	Create LICENSE	2023-02-20 22:07:23 +00:00
plexx	5c16f126c9	Merge pull request #1 from plexx-dev/add-license-1 Create LICENSE	2022-03-27 14:34:45 +02:00
plexx	7fa4acdc31	Create LICENSE	2022-03-27 14:34:25 +02:00
plexx	12790fb2dc	Update README.md	2022-01-20 01:04:51 +01:00
Ole Siepmann	d73baa4c39	Update README.md	2021-04-26 13:48:28 +02:00
Ole Siepmann	c0b78dda44	Update ReadMe	2021-04-26 13:47:19 +02:00
Ole Siepmann	d3dfeb867e	Update ReadMe	2021-04-26 13:46:56 +02:00
weckyy702	4a8f3649c8	reworked image generation	2021-04-26 11:50:42 +02:00
weckyy702	968bb53883	fixed image generation	2021-04-25 14:22:03 +02:00
weckyy702	45cb5c0467	rewrote instruction classes	2021-04-25 14:21:54 +02:00
weckyy702	d8dde66d78	updated image generation code [WIP]	2021-04-16 11:46:32 +02:00
weckyy702	f4c9c77ad8	turned SourceLocation class into a dataclass	2021-04-05 23:29:50 +02:00
weckyy702	dc13f917b0	added curly counter to tokenizer for basic error checking	2021-04-05 20:19:53 +02:00
weckyy702	bb67b3dc0a	turned token class into a dataclass	2021-04-05 20:19:03 +02:00
weckyy702	c346df9f6a	improved for loops	2021-04-05 20:18:45 +02:00
weckyy702	4592aa6725	Lexer: added support for for loops	2021-04-05 20:17:50 +02:00
weckyy702	bb0362ed10	updated for instruction interface to be more inline with the other instructions	2021-04-05 12:53:11 +02:00
weckyy702	1345196ae9	Added lexing support for funciton headers, while and do while loops and variable declarations as well as appropriate syntax checks	2021-04-03 23:36:28 +02:00
weckyy702	965bd61140	undid some silliness	2021-04-03 23:34:41 +02:00
weckyy702	f66c5d4321	Added more location data to Token objects so lexing error messages can be more helpful	2021-04-03 23:34:24 +02:00
weckyy702	3bc93fa3a7	Added instruction generation code to Lexer	2021-04-01 17:00:19 +02:00
weckyy702	49f3c84e60	split interpretation into two steps: Tokenization and Lexing	2021-03-31 19:47:37 +02:00
weckyy702	53534ee707	updated interpreter	2021-03-28 23:42:54 +02:00
weckyy702	1a04f9914c	removed testing files	2021-03-28 17:03:05 +02:00
weckyy702	5662e87c83	started implementing new and improved lexer	2021-03-28 17:02:22 +02:00
weckyy702	3860250e31	created development branch	2021-03-28 12:12:46 +02:00
Weckyy702	ec6b5fec33	removed unwanted files	2021-03-21 18:35:58 +01:00
Weckyy702	88a375ca6d	updated .gitignore	2021-03-21 18:35:15 +01:00
weckyy702	a6d81ab0ed	Merge branch 'main' of https://github.com/plexx-dev/Nassi-Shneiderman-Diagramm-Generator	2021-01-24 21:26:55 +01:00
plexx	e2551ac0f9	+ fixed if statement	2021-01-24 21:02:43 +01:00
weckyy702	33dfcc9108	Moar cleanup	2021-01-17 23:37:07 +01:00