From 711ceb2567eb882e1f809c79c6036d7498f3be3c Mon Sep 17 00:00:00 2001
From: weckyy702 <weckyy702@gmail.com>
Date: Mon, 21 Dec 2020 22:07:20 +0100
Subject: [PATCH] updated .gitignore

---
 .gitignore                               |   8 +++--
 NassiShneidermann.py                     |   6 +++-
 __pycache__/Iinstruction.cpython-39.pyc  | Bin 4926 -> 4921 bytes
 __pycache__/code_to_image.cpython-39.pyc | Bin 3376 -> 3301 bytes
 interpet_source.py                       |  42 +++++++++++++++++------
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15d44ee..b526ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
-__pycache__/
-res/output/
-res/input/
\ No newline at end of file
+__pycache__/*
+res/output/*
+res/input/*
+.vscode/*
+*.pyc
\ No newline at end of file
diff --git a/NassiShneidermann.py b/NassiShneidermann.py
index b7fc90b..685eb86 100644
--- a/NassiShneidermann.py
+++ b/NassiShneidermann.py
@@ -1,6 +1,7 @@
 from os import cpu_count
 from code_to_image import NSD_save
 from Iinstruction import Iinstruction
+import interpet_source as itp
 import logging
 
 class NassiShneidermanDiagram:
@@ -29,6 +30,9 @@ class NassiShneidermanDiagram:
             x, y = instruction.to_image(x, y, x_sz, 200)
         cti.NSD_save(filename)
 
+    def load_from_file(self, filepath:str):
+        source_code = itp.load_src(filepath)
+        instructions = itp.get_scoped_instructions(filepath)
 
 
 
@@ -39,6 +43,6 @@ if __name__ == "__main__":
 
     NSD = NassiShneidermanDiagram(True)
 
-    #NSD.load_from_file("res/input/input.java")
+    NSD.load_from_file("res/input/input.java")
 
     NSD.convert_to_image("Nina", 500)
diff --git a/__pycache__/Iinstruction.cpython-39.pyc b/__pycache__/Iinstruction.cpython-39.pyc
index c1ec0497f33da854ba173426515821d8a99ab940..9cf077e26b9c33f8807a102a083edbb3bb4d19d6 100644
GIT binary patch
delta 417
zcmXYrKTpD75XO7ZzLb_qOQHTl0cnaA(E5i-7mbT?a3FDDYXU|R7fW<>aWK*G1{0l}
z9Gnb;aWT623H$&KuKE$YE4;})d2;u>_q#Xm)zd=5&?I^nx6fJ%3U=3ikU{FHU2zE@
zb)hZ!`Jo3pGIWN0Wh+svP&is3@#V;1pJo|#@gwy~xoh<tpn{<7K^6D4dz0gl$KtTm
zC})F<ntlW&Jk@Pc<+h7qc51pzwnR1Hvs949yfULXsi=&<$vJ$=wy~bM6LlI!4caq_
z-<d~d8Z{6xqKPjPE-c230RJXJlh=*NMRoym3O?CGs(~O;6ONo$B7e*{fh7zxd2E<9
zopX`NvK-^i%qFa$YxJOlX=_#lJX&QMzAG|rTQ_2jTkGQkeymN{h>0y~_o+riaFRr9
Y;Xy7)`c?<8a=Ut&KgPfoe&vq;0a}JrGynhq

delta 422
zcmXYtJ5K^Z6ovP~?y$_Vu*+k8Ap*kU3Md92B-&_fjD-b>{U%@}v2lq00PVEAomN&B
zR))gZ80~CrDJ@K_w6=2Y!X)?P<jk4*CiCpRxZF2QuE>=Wk30gIbSHJEg3{GH>=Hof
zKwI%L0~dBw7!G>cRw!GPWic<sQ-w)BN-|3EE%GjVSNb_X5rOYP8Ta|EMRl=2;*fZ<
zmjV~LaRhlhHBzihv5S6Ua;hNhoSZ&AO9z$Zv}x`{L;-)ov-pr`V>Nce>U3a9-ZO!p
zv3p{g6<`5k8K2@MSPU3V{Ehoop2`6^ORh<rOjX)LIejKY4>@XD6V)-}1ZwEV(pa-9
z2K9tR(g<*8RvlKbWOiYQQG13pX={~e_^PS6ZC|rBiq^*u__8-)BOtb9+><jRf)kd+
c79J!U`uCrVJ$r~3$z6j!Km^nlek70o0fcK;UjP6A

diff --git a/__pycache__/code_to_image.cpython-39.pyc b/__pycache__/code_to_image.cpython-39.pyc
index f25e63912fa3d28d86d95c3ed5f08a5bb3cdfceb..a01154a275f240066557754c0723187f875ce88b 100644
GIT binary patch
delta 496
zcmYLEO)o=16rKA%`Z~N9nut<Lsi3H;U?oVTB+^8Jg`Lp%T92e{=1nMh@e7E>ESg%_
zTOnPEg@51&yja+XNW^b2mx!C(Gbd-xJu~+%_SS9fT2>2@byk1fS-Q9C5Kl12%M>eR
z?qxQsy9H;JRk-6Frt@xTpNl8>Y}2JbEPGkDw@1V??Olr!U-7jlDJoH7E4FHD7b*}=
z4pbj({rA=mbr5v;glo28hoz5Rgn;<)H@itvEn;5Hg&4@}57AKb5uKTm2Q*hJI92Xe
z%7SV=31&$#rL%}Un1O&l3iO)io;rbkBJ$dF_GdHDAZ!e&!wMUejvGCog-Y3WG3kGh
zB`{*3+0-tT&OYS*2>3{#ai_*vQfwPJm=L!#-h4EQ5Fe3u?^g}1hsDw_X)LlXoJ)xX
z+TA{ebQ}S5WI~Cq!c_B?9zi;d3NFbohfPW-6@TjMF9Y=qLQ-tBu0U2aTF+rx44b1c
mC)Ujo2*j~D5Sl^DthhFZVz^+Sx@FELP@F=@BFu>wbL$)InRCtn

delta 572
zcmYjNJ#Q015Z&3`yYu<(D3FEoK_U{&hatwqD5N2BfgBo?0#jXMS>Cg;m7LMuf(*J)
z;1&y^El{Xv(}7%3(nf(F;EDzzBn$omJC}x$=4tl5nYTOpbMezs&<=t;F|jItwC;Tl
z-ox^$jFM`17^|eZH&nxBJ5DN(qTaLpw$xu?zGIv2oXPtplUD{5NqhwY#_$>x9k7%L
zD%gYyzDN!&#ZxQgV|vIH8Cd!|E$&!?3wy%AOb+Z6gi|CbO}WSwNRf1DN)#2Y$O}t&
z6B|ehsG`y&WnZte#zM&Ul`KQ(ioT3Gsy~c>gL#S62kc?Vk-n*CZe!Gmo}wlLJUhKe
zCH<Gtj2*N``h+dhvaRQA#SJ|bja2JJOIy6Qb<Xq>;E-eIA<s(eDwQR}99yB=8OEZY
z89IiM_z7|y;qvqee@ic1!g>uMyO5);yrKiA0hMXf8N=>%BmVkugz=@`J1dUrasg*<
zp!V$)V_rYDvL)mSDmM`}5YX2+UUVP8=2W=Pp>hkEY<KjQRRg_l7JvTpmAB6Z9d8$E
zde3_Ucl1ZUp#ORW*w);?2BF^Y*X%89yQ`aiX$hB}v3{&%1<6f>8p5`I=Rf`j#;S_+

diff --git a/interpet_source.py b/interpet_source.py
index 03ddb4f..a5939dd 100644
--- a/interpet_source.py
+++ b/interpet_source.py
@@ -1,6 +1,7 @@
+from Iinstruction import *
 import logging
 import re
-from typing import Iterator
+from typing import Any, Iterator
 
 class Scope():
 
@@ -27,7 +28,7 @@ def load_src(filepath: str) -> list[str]:
     
     return lines
 
-def read_scopes(src: list[str]):
+def get_scopes(src: list[str]):
     global_scope = Scope(None)
     current_scope = global_scope
 
@@ -47,18 +48,37 @@ def read_scopes(src: list[str]):
     
     return global_scope
 
-def print_scope(scope: Scope):
-    print('[', end='')
+def get_instructions(scope: Scope) -> list[Any]:
+    instructions = []
+
     for item in scope.contents:
         if isinstance(item, Scope):
-            print_scope(item)
+            instructions.extend(get_instructions(item))
         else:
-            print(item, end=", ")
-    print(']')
+            instructions.append(item)
+    
+    return instructions
+
+
+
+def get_scoped_instructions(filepath:str) -> list[Any]:
+    source_code = load_src(filepath)
+    global_scope = get_scopes(source_code)
+
+    instructions = get_instructions(global_scope)
+    return instructions
 
 if __name__ == "__main__":
+
+    def print_scope(scope: Scope):
+        print('[', end='')
+        for item in scope.contents:
+            if isinstance(item, Scope):
+                print_scope(item)
+            else:
+                print(item, end=", ")
+        print(']')
+
     logging.basicConfig(level=logging.DEBUG)
-    lines = load_src("res/input/input.java")
-    scope = read_scopes(lines)
-    
-    print_scope(scope)
\ No newline at end of file
+    inst = get_scoped_instructions("res/input/input.java")
+    print(inst)
\ No newline at end of file