From 33dfcc91080339b919c48b9451080884569a0b13 Mon Sep 17 00:00:00 2001 From: weckyy702 Date: Sun, 17 Jan 2021 23:37:07 +0100 Subject: [PATCH 1/8] Moar cleanup --- draw/Iinstruction.py | 12 +- interpreter/Function_scope.py | 24 ++ interpreter/interpret_source.py | 23 +- res/input/input.java | 573 ++++++++++++++++---------------- 4 files changed, 319 insertions(+), 313 deletions(-) create mode 100644 interpreter/Function_scope.py diff --git a/draw/Iinstruction.py b/draw/Iinstruction.py index 40e1684..a4a13f0 100644 --- a/draw/Iinstruction.py +++ b/draw/Iinstruction.py @@ -81,19 +81,19 @@ class if_instruction(Iinstruction): return max(self._getblkwidth(), self.get_truewidth() + self.get_falsewidth()) def get_truewidth(self) -> float: - w = 0.0 + w = 50 for inst in self.true_case: - w += inst.getblkwidth() + w = max(w, inst.getblkwidth()) return w def get_falsewidth(self) -> float: - w = 0.0 + w = 50 if self.false_case: for inst in self.false_case: - w += inst.getblkwidth() + w = max(w, inst.getblkwidth()) return w @@ -161,9 +161,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: diff --git a/interpreter/Function_scope.py b/interpreter/Function_scope.py new file mode 100644 index 0000000..e9cc273 --- /dev/null +++ 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__() \ No newline at end of file diff --git a/interpreter/interpret_source.py b/interpreter/interpret_source.py index e0516f8..62426fb 100644 --- a/interpreter/interpret_source.py +++ b/interpreter/interpret_source.py @@ -4,6 +4,7 @@ from typing import Dict, List, Match, Tuple, Union from errors.custom import InterpreterException, JavaSyntaxError, ScopeNotFoundException from draw.Iinstruction import * +from interpreter.Function_scope import Function_scope logging.warning("""Because the Interpreter is still WIP, some Java language features are not supported. These include: *foreach loops (will throw JavaSyntaxError) @@ -12,28 +13,6 @@ logging.warning("""Because the Interpreter is still WIP, some Java language feat *Generics Please remove these features from the source code as they will result in incorrect behaviour""") -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__() - class JavaInterpreter: def __init__(self, filepath: str) -> None: diff --git a/res/input/input.java b/res/input/input.java index 6004bbe..7cb294b 100644 --- a/res/input/input.java +++ b/res/input/input.java @@ -1,331 +1,334 @@ -import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) +// import greenfoot.*; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) -//Comment that the interpreter may never know of +// //Comment that the interpreter may never know of -public class Rover extends Actor -{ - private Display anzeige; +// public class Rover extends Actor +// { +// private Display anzeige; - /** - * this function is to be implemented by the user - * depending on the needed actions - */ +// /** +// * this function is to be implemented by the user +// * depending on the needed actions +// */ - public Display getDisplay() - { - return anzeige; - } +// public Display getDisplay() +// { +// return anzeige; +// } - public void act() - { - S66Nr3(7); - } +// public void act() +// { +// S66Nr3(7); +// } - private void fahreUmHuegel(String richtung) - { - String pri; - String sec; - if(richtung.equals("Hoch")) { - pri = "links"; - sec = "rechts"; - } else if (richtung.equals("Runter")) { - pri = "rechts"; - sec = "links"; - } else { - nachricht("JUNGE DU SPAST!"); - return; - } - drehe(pri); - fahre(); - drehe(sec); - fahre(); - fahre(); - drehe(sec); - fahre(); - drehe(pri); - } +// private void fahreUmHuegel(String richtung) +// { +// String pri; +// String sec; +// if(richtung.equals("Hoch")) { +// pri = "links"; +// sec = "rechts"; +// } else if (richtung.equals("Runter")) { +// pri = "rechts"; +// sec = "links"; +// } else { +// nachricht("JUNGE DU SPAST!"); +// return; +// } +// drehe(pri); +// fahre(); +// drehe(sec); +// fahre(); +// fahre(); +// drehe(sec); +// fahre(); +// drehe(pri); +// } - private void fahreBisHuegel() - { - while(!huegelVorhanden("vorne")) - { - fahre(); - } - } +// private void fahreBisHuegel() +// { +// while(!huegelVorhanden("vorne")) +// { +// fahre(); +// } +// } - private void fahreZeileDreheHoch() - { - fahreBisHuegel(); - fahreUmHuegel("Hoch"); - fahreBisHuegel(); - drehe("um"); +// private void fahreZeileDreheHoch() +// { +// fahreBisHuegel(); +// fahreUmHuegel("Hoch"); +// fahreBisHuegel(); +// drehe("um"); - fahreBisHuegel(); - fahreUmHuegel("Runter"); - fahreBisHuegel(); - drehe("rechts"); - fahre(); - drehe("rechts"); - } +// fahreBisHuegel(); +// fahreUmHuegel("Runter"); +// fahreBisHuegel(); +// drehe("rechts"); +// fahre(); +// drehe("rechts"); +// } - private void fahreZeileDreheRunter(boolean geheInNächsteZeile) - { - fahreBisHuegel(); - fahreUmHuegel("Runter"); - fahreBisHuegel(); - drehe("um"); +// private void fahreZeileDreheRunter(boolean geheInNächsteZeile) +// { +// fahreBisHuegel(); +// fahreUmHuegel("Runter"); +// fahreBisHuegel(); +// drehe("um"); - fahreBisHuegel(); - fahreUmHuegel("Hoch"); - fahreBisHuegel(); - if(geheInNächsteZeile) { - drehe("rechts"); - fahre(); - drehe("rechts"); - } else { - drehe("um"); - } - } +// fahreBisHuegel(); +// fahreUmHuegel("Hoch"); +// fahreBisHuegel(); +// if(geheInNächsteZeile) { +// drehe("rechts"); +// fahre(); +// drehe("rechts"); +// } else { +// drehe("um"); +// } +// } - private void S66Nr3(int anzahlZeilen) - { - if(anzahlZeilen < 3) { - nachricht("Ich muss mindestens drei Zeilen fahren! :("); - return; - } - int i = 1; - fahreZeileDreheHoch(); - for(; i < anzahlZeilen-1; i++) { - fahreZeileDreheRunter(true); - } - fahreZeileDreheRunter(false); - } +// private void S66Nr3(int anzahlZeilen) +// { +// if(anzahlZeilen < 3) { +// nachricht("Ich muss mindestens drei Zeilen fahren! :("); +// return; +// } +// int i = 1; +// fahreZeileDreheHoch(); +// for(; i < anzahlZeilen-1; i++) { +// fahreZeileDreheRunter(true); +// } +// fahreZeileDreheRunter(false); +// } - /** - * Der Rover bewegt sich ein Feld in Fahrtrichtung weiter. - * Sollte sich in Fahrtrichtung ein Objekt der Klasse Huegel befinden oder er sich an der Grenze der Welt befinden, - * dann erscheint eine entsprechende Meldung auf dem Display. - */ - public void fahre() - { - int posX = getX(); - int posY = getY(); +// /** +// * Der Rover bewegt sich ein Feld in Fahrtrichtung weiter. +// * Sollte sich in Fahrtrichtung ein Objekt der Klasse Huegel befinden oder er sich an der Grenze der Welt befinden, +// * dann erscheint eine entsprechende Meldung auf dem Display. +// */ +// public void fahre() +// { +// int posX = getX(); +// int posY = getY(); - if(huegelVorhanden("vorne")) - { - nachricht("Zu steil!"); - } - else if(getRotation()==270 && getY()==1) - { - nachricht("Ich kann mich nicht bewegen"); - } - else - { - move(1); - Greenfoot.delay(1); - } +// if(huegelVorhanden("vorne")) +// { +// nachricht("Zu steil!"); +// } +// else if(getRotation()==270 && getY()==1) +// { +// nachricht("Ich kann mich nicht bewegen"); +// } +// else +// { +// move(1); +// Greenfoot.delay(1); +// } - if(posX==getX()&&posY==getY()&&!huegelVorhanden("vorne")) - { - nachricht("Ich kann mich nicht bewegen"); - } - } +// if(posX==getX()&&posY==getY()&&!huegelVorhanden("vorne")) +// { +// nachricht("Ich kann mich nicht bewegen"); +// } +// } - /** - * Der Rover dreht sich um 90 Grad in die Richtung, die mit richtung (ᅵlinksᅵ oder ᅵrechtsᅵ) ᅵbergeben wurde. - * Sollte ein anderer Text (String) als "rechts" oder "links" ᅵbergeben werden, dann erscheint eine entsprechende Meldung auf dem Display. - */ - public void drehe(String richtung) - { - if(richtung.equals("rechts")){ - setRotation(getRotation()+90); - }else if(richtung.equals("links")){ - setRotation(getRotation()-90); - } else if(richtung.equals("um")) { - setRotation(getRotation()+180); - }else { - nachricht("Keinen Korrekte Richtung gegeben!"); - } - } +// /** +// * Der Rover dreht sich um 90 Grad in die Richtung, die mit richtung (ᅵlinksᅵ oder ᅵrechtsᅵ) ᅵbergeben wurde. +// * Sollte ein anderer Text (String) als "rechts" oder "links" ᅵbergeben werden, dann erscheint eine entsprechende Meldung auf dem Display. +// */ +// public void drehe(String richtung) +// { +// if(richtung.equals("rechts")){ +// setRotation(getRotation()+90); +// }else if(richtung.equals("links")){ +// setRotation(getRotation()-90); +// } else if(richtung.equals("um")) { +// setRotation(getRotation()+180); +// }else { +// nachricht("Keinen Korrekte Richtung gegeben!"); +// } +// } - /** - * Der Rover gibt durch einen Wahrheitswert (true oder false )zurᅵck, ob sich auf seiner Position ein Objekt der Klasse Gestein befindet. - * Eine entsprechende Meldung erscheint auch auf dem Display. - */ - public boolean gesteinVorhanden() - { - if(getOneIntersectingObject(Gestein.class)!=null) - { - nachricht("Gestein gefunden!"); - return true; +// /** +// * Der Rover gibt durch einen Wahrheitswert (true oder false )zurᅵck, ob sich auf seiner Position ein Objekt der Klasse Gestein befindet. +// * Eine entsprechende Meldung erscheint auch auf dem Display. +// */ +// public boolean gesteinVorhanden() +// { +// if(getOneIntersectingObject(Gestein.class)!=null) +// { +// nachricht("Gestein gefunden!"); +// return true; - } +// } - return false; - } +// return false; +// } - /** - * Der Rover ᅵberprᅵft, ob sich in richtung ("rechts", "links", oder "vorne") ein Objekt der Klasse Huegel befindet. - * Das Ergebnis wird auf dem Display angezeigt. - * Sollte ein anderer Text (String) als "rechts", "links" oder "vorne" ᅵbergeben werden, dann erscheint eine entsprechende Meldung auf dem Display. - */ - public boolean huegelVorhanden(String richtung) - { - int rot = getRotation(); +// /** +// * Der Rover ᅵberprᅵft, ob sich in richtung ("rechts", "links", oder "vorne") ein Objekt der Klasse Huegel befindet. +// * Das Ergebnis wird auf dem Display angezeigt. +// * Sollte ein anderer Text (String) als "rechts", "links" oder "vorne" ᅵbergeben werden, dann erscheint eine entsprechende Meldung auf dem Display. +// */ +// public boolean huegelVorhanden(String richtung) +// { +// 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==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==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==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" && 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!"); - } +// if(richtung!="vorne" && richtung!="links" && richtung!="rechts") +// { +// nachricht("Befehl nicht korrekt!"); +// } - return false; - } +// return false; +// } - /** - * Der Rover ermittelt den Wassergehalt des Gesteins auf seiner Position und gibt diesen auf dem Display aus. - * Sollte kein Objekt der Klasse Gestein vorhanden sein, dann erscheint eine entsprechende Meldung auf dem Display. - */ - public void analysiereGestein() - { - if(gesteinVorhanden()) - { - nachricht("Gestein untersucht! Wassergehalt ist " + ((Gestein)getOneIntersectingObject(Gestein.class)).getWassergehalt()+"%."); - Greenfoot.delay(1); - removeTouching(Gestein.class); - } - else - { - nachricht("Hier ist kein Gestein"); - } - } +// /** +// * Der Rover ermittelt den Wassergehalt des Gesteins auf seiner Position und gibt diesen auf dem Display aus. +// * Sollte kein Objekt der Klasse Gestein vorhanden sein, dann erscheint eine entsprechende Meldung auf dem Display. +// */ +// public void analysiereGestein() +// { +// if(gesteinVorhanden()) +// { +// nachricht("Gestein untersucht! Wassergehalt ist " + ((Gestein)getOneIntersectingObject(Gestein.class)).getWassergehalt()+"%."); +// Greenfoot.delay(1); +// removeTouching(Gestein.class); +// } +// else +// { +// nachricht("Hier ist kein Gestein"); +// } +// } - /** - * Der Rover erzeugt ein Objekt der Klasse ᅵMarkierungᅵ auf seiner Position. - */ - public void setzeMarke() - { - getWorld().addObject(new Marke(), getX(), getY()); - } +// /** +// * Der Rover erzeugt ein Objekt der Klasse ᅵMarkierungᅵ auf seiner Position. +// */ +// public void setzeMarke() +// { +// getWorld().addObject(new Marke(), getX(), getY()); +// } - /** - * *Der Rover gibt durch einen Wahrheitswert (true oder false )zurᅵck, ob sich auf seiner Position ein Objekt der Marke befindet. - * Eine entsprechende Meldung erscheint auch auf dem Display. - */ - public boolean markeVorhanden() - { - if(getOneIntersectingObject(Marke.class)!=null) - { - return true; - } +// /** +// * *Der Rover gibt durch einen Wahrheitswert (true oder false )zurᅵck, ob sich auf seiner Position ein Objekt der Marke befindet. +// * Eine entsprechende Meldung erscheint auch auf dem Display. +// */ +// public boolean markeVorhanden() +// { +// if(getOneIntersectingObject(Marke.class)!=null) +// { +// return true; +// } - return false; - } +// return false; +// } - public void entferneMarke() - { - if(markeVorhanden()) - { - removeTouching(Marke.class); - } - } +// public void entferneMarke() +// { +// if(markeVorhanden()) +// { +// removeTouching(Marke.class); +// } +// } - private void nachricht(String pText) - { - if(anzeige!=null) - { - anzeige.anzeigen(pText); - Greenfoot.delay(1); - anzeige.loeschen(); - } - } +// private void nachricht(String pText) +// { +// if(anzeige!=null) +// { +// anzeige.anzeigen(pText); +// Greenfoot.delay(1); +// anzeige.loeschen(); +// } +// } - private void displayAusschalten() - { - getWorld().removeObject(anzeige); +// private void displayAusschalten() +// { +// getWorld().removeObject(anzeige); - } +// } - protected void addedToWorld(World world) - { - setImage("images/rover.png"); - world = getWorld(); - anzeige = new Display(); - anzeige.setImage("images/nachricht.png"); - world.addObject(anzeige, 7, 0); - if(getY()==0) - { - setLocation(getX(),1); - } - anzeige.anzeigen("Ich bin bereit"); - } +// protected void addedToWorld(World world) +// { +// setImage("images/rover.png"); +// world = getWorld(); +// anzeige = new Display(); +// anzeige.setImage("images/nachricht.png"); +// world.addObject(anzeige, 7, 0); +// if(getY()==0) +// { +// setLocation(getX(),1); +// } +// anzeige.anzeigen("Ich bin bereit"); +// } - class Display extends Actor - { - GreenfootImage bild; +// class Display extends Actor +// { +// GreenfootImage bild; - public Display() - { - bild = getImage(); - } +// public Display() +// { +// bild = getImage(); +// } - public void act() - { +// public void act() +// { - } +// } - public void anzeigen(String pText) - { - loeschen(); - getImage().drawImage(new GreenfootImage(pText, 25, Color.BLACK, new Color(0, 0, 0, 0)),10,10); +// public void anzeigen(String pText) +// { +// loeschen(); +// getImage().drawImage(new GreenfootImage(pText, 25, Color.BLACK, new Color(0, 0, 0, 0)),10,10); - } +// } - public void loeschen() - { - getImage().clear(); - setImage("images/nachricht.png"); - } +// public void loeschen() +// { +// getImage().clear(); +// setImage("images/nachricht.png"); +// } - } +// } - public class Direction { - Direction(int val){ - this.value = val; - } - final int value; - }; -} +// public class Direction { +// Direction(int val){ +// this.value = val; +// } +// final int value; +// }; +// } +void function() { + print(12); +} \ No newline at end of file From e2551ac0f9692c968dfa543aa73e258666269749 Mon Sep 17 00:00:00 2001 From: plexx Date: Sun, 24 Jan 2021 21:02:43 +0100 Subject: [PATCH 2/8] + fixed if statement --- draw/code_to_image.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/draw/code_to_image.py b/draw/code_to_image.py index c9d234a..964182c 100644 --- a/draw/code_to_image.py +++ b/draw/code_to_image.py @@ -63,8 +63,8 @@ def draw_if_statement(condition: str, x: int, y: int, true_sz: int, false_sz: in box_sz = true_sz + false_sz - output_img.line((x,y) + (x + box_sz/2, y + text_y_size), fill=(0)) - output_img.line((x + box_sz, y) + (x + box_sz/2, y + text_y_size), fill=(0)) + 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)) From 88a375ca6d0fa6db6db7541a9d5d9fe69fb4258f Mon Sep 17 00:00:00 2001 From: Weckyy702 Date: Sun, 21 Mar 2021 18:35:15 +0100 Subject: [PATCH 3/8] updated .gitignore --- .gitignore | 5 ++--- .vscode/launch.json | 15 --------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 .vscode/launch.json diff --git a/.gitignore b/.gitignore index 84cd2f2..06ddbd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ -__pycache__/ +/__pycache__/ res/output/ res/input/ -.vscode/ +/.vscode/ *.json *.pyc *.png @@ -9,5 +9,4 @@ debug.py build/ run.spec dist/ -.vscode/launch.json res/input/input_large.java diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 1ded7e8..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "Python: Aktuelle Datei", - "type": "python", - "request": "launch", - "program": "run.py", - "console": "integratedTerminal" - } - ] -} \ No newline at end of file From ec6b5fec336a5a4d778cb7b9d90cb3c5795be14d Mon Sep 17 00:00:00 2001 From: Weckyy702 Date: Sun, 21 Mar 2021 18:35:58 +0100 Subject: [PATCH 4/8] removed unwanted files --- __pycache__/Iinstruction.cpython-39.pyc | Bin 4919 -> 0 bytes __pycache__/code_to_image.cpython-39.pyc | Bin 3259 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 __pycache__/Iinstruction.cpython-39.pyc delete mode 100644 __pycache__/code_to_image.cpython-39.pyc diff --git a/__pycache__/Iinstruction.cpython-39.pyc b/__pycache__/Iinstruction.cpython-39.pyc deleted file mode 100644 index 8d97961bd4b9aabd0bb011c40e314373b1e5ae37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4919 zcmcgv&5zs06`vu86h%>5*}Gn^Q-3IJ(nf8)N&0~XL6ADNfgpe(2iT$rh%E@NW_Fir zigJeBcqLG$&7a|e_o#oR*WP%|sn??Dp z!}`;A-k-M#`3{x(fp;H4i~kNCC!B`FrEt|kZKS*Uh`EfST@Q_s>6%JrAsIE?#>jFl zN&@9os)Lk3&CbvPimEHoq#U0Qcr8}Uvc?a~4aA15}bokbD zP5xE1cvsl`#wESppD?i9RCln?M}l;MW7YLiKhfcBTcW|Y`SztoiP(DG23gC|}P1xYT& z{x@QX&)1IzD374UpF$^8MqQ0lR~L+HTz{o;#*J^8YY0;`7N;c|cOZ+e43$B4N!=#b zz`JJVd=W(8#Q87@#?kb_@BCQwhM^zFz2mX$`C-_r-H!)zE$h|{ULr1%%#%PE2!xcT#DgpykU1UnsceD`-o|1P9_I>?9kBi5;MvEATzqr*k z;NUb80T*)QFANWBmWNLQ|3vzu(ZkP01Sw9&@~|G&{)n|aiZ9QU1EXq*Q8~dUF<}L8?yhlnzrc^Y0V9{Nf+@wOyy$_D zdvT^gO=zi}vMb|In;A1RHB$2!>QdpTuV*?`rMt(a|I%CYMO8KZ#zvsIMkHQ(7x`tf z8WYBI2U?8zA#{&U*G5%APu_-cat}LvPQHcR53s}ZWO@M8p`djaZ5#1*5AI??#E708 zUlMJb(Urj6I=XmUFahj#hvdCtJ*HUCZ~pQ%~Pnn1b28v@&A z_OTzvxt!CCnh=N?50py)V`A$72JjFM0Yp5#0yC?D`E7VY{t!C&uHqwPU0GUJF@Y2L zV`yq_2z97Qr?;0=@CKOU(^!ED<}L_pU~VDIXN{RPYtHOhYv!cnwT`e)8>w~0W^K?} z+Dz@Vl{%nz5+iM=ol9-D1;t{fTenG7Af~(zUvY1!0s%MU#81RX01h$CtfTBzqPLV@ zWjoVH{zbpLxqeLb?1h_OCvHAz@f2#R6en&Yf8#|VOx(qcs)3a}aa-zrN8xi=QCuf~ zY@wO?b#+3pihc$y#@rIh;I#g;!@9If?dwxh)aqvPL84B9YEqVvl$_B^dXLN)N>9ii z_ke)R*A*!-ASF7}zTN|z8GFU@hO`ulC?~XU-PM2$$M}EpHg`R zrZw*yZ`r#IiS{A1rK4QSpMtqyTLF7YVE~I#uD#N^&KYoHxvS*HE5=RU02}Pci<4Wx zqB*zPY6slPZofPYV4G5dfOjlm^&ZUitO?6_&ZwDF8xZGIh&d<@luIf^;9aM}iUjp4 zbJ@)ye4f`oAJ6r?>an)u&#_yXRIInJpeK)wQQ_}y0>yILTdP&BwoM4=3Z_yOIHpbFIxq2q zH7BaF?!%2gKvS8uv|YAiNVI*gCB1t+@FRctd?0^{o~)KF{wzI4m+^O~DBD!K(w8^k z7)8Db-$!X>2CyX0pcR|&2kTuZ>ruWBgTIIJ+gU9?OoXbwd=5Wc6AMoB2xF;L$EJAx z|HUD(u;ee-_^CjMe&W8aMEyG(GQR|R`K#skRRG4dK7f`3nC|KTV6@@C?Z^)z&zm~& z>G(Y4gFqzj^`~ZWJym+}H~8`H-^kj-F&AE$9^4CNW-@sZL?`(|i7?D`|7fUwef$>Hem> Z-R)W$ZUfZ$FU`d3?!UEvGTVlc{{`r%4v7E& diff --git a/__pycache__/code_to_image.cpython-39.pyc b/__pycache__/code_to_image.cpython-39.pyc deleted file mode 100644 index f3c1216bb3560638c93ff50f46719b0376a171c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3259 zcmai0OK%)S5T2gLzPx^~gkOi z@`-TZ;vW!{L(I)Tfj@vy1b<*oNF2Zt;>0N@zUtXs&-xL1)IB{_)!o%qU)7X5JX|u+ z3NQa?d_Q3rf6zy^${ES4*Hkq@eBrKykMN| z7(1+Ga&ymeO=Z2XmAS`UN9A7Rxy9{069zJ%inEkh4;F9LosCsbiS4Qs@%0uCjIS@R zyG^kuBPHUs*}GnQRm~~YIw<3WT2WefB~~al63YwP(#B`q)=HP6j#}@i29ZgxdO^vK zP+RLFv1w;XUfnn3C|<7~-n+TN#gmo$TWU25SC-s3_Lf&e;c+1Yw@aAKP-bs?Zdb6ijWfr2+_)M>s!A8}T;JOk z{9^SRcTH5|jucfDRhzEwS9^D@wmgYjF=%^01Hh7pD|{~$iL>ExwR%9;YNMn5zL1!H zkT{YYTeIZ|Xi3fuo2!vb9Gun;;V#ejYmOWyUh%8VrdZb&D@xH+ZrJukG7@xr<P7usyh5Tjf ziYYIHw(lgxW)yN*B?=Euk(a=e?_fCQ$|8u`l|RBTr@NAy=iw%D3AbpbU21b@7xCM5 zx^{Q!`2UfH`?EV8gNjZ0=nyJ{a2h!OP)-Bx__?(AA@!Kv_8^}ZdSK+Xa*zQnUgAT$ zd40zmKwIwGU^tcIBapKBC?DH(dNKriUOt=JswX$D&DsTCN|9 zx+#OM{9g;Typ9$5HtlOuRLCl(@*)j7!fYKS@6tErzf2g6>oD+IjsA77LLjDF7$)#< zUSo4?hFxXz){J$TUA5%<;2eWG1)YZa!`DKcT-?i88F;5TZ6KdzxX5h;2@PvK%Vxlo zcfy{TkQrQ?=F80f-E%cW`X?P`){JCE6P;HHRQ(kvYC_?dm2rAOfQ+n50|NIEnRG{s z0tVp4*s=l6;*y4*2Ar(H+<&GZ`)Q$zwr2|(F>;o8zx_(>?}hy|jcRDf>)^=uXwWb` z2@X>l4)`hiqTxr;dZQ)r@B9pFVgkN~gmZyiVDs!6o_Py^_z3jV0de=WfZ%58TJ1m> zYQWfiUK+i95Oj?QN1n0*X6qRm=I^@y)K!CgIxD4gAuxDG1}v|W(hxla^x+;UAi6h$ zp4nftML+32AbK(u-6g%z01$4#?1yNOAKYT12) zG6LzeDFsq2M+M=Fx^;hPaj9lWs+|%$hD=iCV0#S_@(%Lk$6y@IUb^BUS;~bmWo5&Z zpI}T1jYi;lVWZ*AKr!!M4D~!}O67%XwW-94x8fv+>X0%pt;6|u?&|VV7nQn%lsCc9 z3Z?l~r&6coN3PN(9d=Pt*9NFYQDIVM)X|^~)z^b8)o5f?*C|*RA%#zah Date: Mon, 26 Apr 2021 13:48:28 +0200 Subject: [PATCH 5/8] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d76a6c0..491d594 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # 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. From 12790fb2dcfc30fc6dcd9a54690ef99b33734eca Mon Sep 17 00:00:00 2001 From: plexx <61423497+plexx-dev@users.noreply.github.com> Date: Thu, 20 Jan 2022 01:04:51 +0100 Subject: [PATCH 6/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 491d594..2b3d6af 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,5 @@ In the final version, you will just have to execute the nassi.exe and choose you Using: Python 3.9.1 with PySimpleGUI, Pillow, Flask & wtforms + +[Just a Visualization of our Progress](https://www.youtube.com/watch?v=WOCruSSG3qg) From 7fa4acdc31ec94b144ae2388fe453d63902da687 Mon Sep 17 00:00:00 2001 From: plexx <61423497+plexx-dev@users.noreply.github.com> Date: Sun, 27 Mar 2022 14:34:25 +0200 Subject: [PATCH 7/8] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..210d825 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 plexx-dev + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 01387c8065bcc0a7e6c91dcce2541e24588c5d9c Mon Sep 17 00:00:00 2001 From: plexx <61423497+plexx-dev@users.noreply.github.com> Date: Mon, 20 Feb 2023 22:07:23 +0000 Subject: [PATCH 8/8] Create LICENSE --- LICENSE | 687 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 670 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 210d825..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -Copyright (c) 2022 plexx-dev + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Preamble -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +.