Concrete syntax no longer indentation-based (nightmare to parse). Add indented multi-line code terminals.
This commit is contained in:
parent
59de61d0a3
commit
e875821e70
8 changed files with 119 additions and 73 deletions
|
|
@ -2,17 +2,8 @@
|
|||
|
||||
from services import od
|
||||
from services.bottom.V0 import Bottom
|
||||
import json
|
||||
from concrete_syntax.common import display_value
|
||||
|
||||
def display_value(val: any, type_name: str):
|
||||
if type_name == "ActionCode":
|
||||
return '`'+val+'`'
|
||||
elif type_name == "String":
|
||||
return '"'+val+'"'
|
||||
elif type_name == "Integer" or type_name == "Boolean":
|
||||
return str(val)
|
||||
else:
|
||||
raise Exception("don't know how to display value" + type_name)
|
||||
|
||||
def render_od(state, m_id, mm_id, hide_names=True):
|
||||
bottom = Bottom(state)
|
||||
|
|
@ -26,19 +17,23 @@ def render_od(state, m_id, mm_id, hide_names=True):
|
|||
|
||||
def write_attributes(object_node):
|
||||
o = ""
|
||||
for attr_name, slot_node in m_od.get_slots(object_node):
|
||||
value, type_name = m_od.read_slot(slot_node)
|
||||
o += f" {attr_name} = {display_value(value, type_name)}\n"
|
||||
slots = m_od.get_slots(object_node)
|
||||
if len(slots) > 0:
|
||||
o += " {"
|
||||
for attr_name, slot_node in slots:
|
||||
value, type_name = m_od.read_slot(slot_node)
|
||||
o += f"\n {attr_name} = {display_value(value, type_name, indentation=4)};"
|
||||
o += "\n}"
|
||||
return o
|
||||
|
||||
for class_name, objects in m_od.get_all_objects().items():
|
||||
for object_name, object_node in objects.items():
|
||||
output += f"{display_name(object_name)}:{class_name}\n"
|
||||
output += f"\n{display_name(object_name)}:{class_name}"
|
||||
output += write_attributes(object_node)
|
||||
|
||||
for assoc_name, links in m_od.get_all_links().items():
|
||||
for link_name, (link_edge, src_name, tgt_name) in links.items():
|
||||
output += f"{display_name(link_name)}:{assoc_name} ({src_name} -> {tgt_name})\n"
|
||||
output += f"\n{display_name(link_name)}:{assoc_name} ({src_name} -> {tgt_name})"
|
||||
# links can also have slots:
|
||||
output += write_attributes(link_edge)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue