bill/whetstone_DSL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

textGen fixed, Phase1Example has 1 error left

Browse Source
This commit is contained in:
Bill
2026-02-04 12:40:33 -07:00
parent 6a695e5ed1
commit a803676f0d
3 changed files with 384 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
Phase1Example.sandbox/models/Phase1Test.mps
View File

@@ -8,35 +8,42 @@
<imports />
<registry>
<language id="a452e1cf-6f8c-4bca-8447-fd4d6e4d0003" name="SemAnno">
<concept id="8440420766104857128" name="SemAnno.structure.Module" flags="ng" index="2Ks9RF">
<child id="8982541288447632590" name="variables" index="2Ks9RG" />
<child id="8982541288447632589" name="functions" index="2Ks9RH" />
<concept id="8440420766104857128" name="SemAnno.structure.Module" flags="ng" index="Module_1">
<child id="8982541288447632590" name="variables" index="Module_v" />
<child id="8982541288447632589" name="functions" index="Module_f" />
</concept>
<concept id="8982541288447632700" name="SemAnno.structure.Variable" flags="ng" index="2KtM7O" />
<concept id="8440420766104857192" name="SemAnno.structure.Function" flags="ng" index="2Ks9S5">
<child id="8982541288447632614" name="parameters" index="2Ks9SI" />
<child id="8982541288447632625" name="body" index="2Ks9SJ" />
<child id="8982541288447632624" name="returnType" index="2Ks9SK" />
<concept id="8440420766104857192" name="SemAnno.structure.Function" flags="ng" index="Func_1">
<child id="8982541288447632623" name="parameters" index="Func_p" />
<child id="8982541288447632622" name="body" index="Func_b" />
<reference id="8982541288447632621" name="returnType" index="Func_rt" />
</concept>
<concept id="8440420766104857256" name="SemAnno.structure.Parameter" flags="ng" index="2Ks9Tj">
<child id="8982541288447632623" name="type" index="2Ks9SL" />
<concept id="8440420766104857256" name="SemAnno.structure.Parameter" flags="ng" index="Param_1">
<reference id="8982541288447632653" name="type" index="Param_t" />
</concept>
<concept id="8982541288447632647" name="SemAnno.structure.Block" flags="ng" index="2KtLg9">
<child id="8982541288447632648" name="statements" index="2KtLgA" />
<concept id="8982541288447632700" name="SemAnno.structure.Variable" flags="ng" index="Var_1" />
<concept id="8982541288447632333" name="SemAnno.structure.Block" flags="ng" index="Block_1">
<child id="8982541288447632334" name="statements" index="Block_s" />
</concept>
<concept id="8982541288447632660" name="SemAnno.structure.Assignment" flags="ng" index="2KtLgs">
<child id="8982541288447632661" name="value" index="2KtLgt" />
<concept id="8440420766104853160" name="SemAnno.structure.Assignment" flags="ng" index="Assign_1">
<reference id="8982541288447632365" name="target" index="Assign_t" />
<reference id="8982541288447632366" name="value" index="Assign_v" />
</concept>
<concept id="8982541288447632764" name="SemAnno.structure.BinaryOperation" flags="ng" index="2KtLkU">
<child id="8982541288447632766" name="left" index="2KtLkW" />
<child id="8982541288447632767" name="right" index="2KtLkX" />
<concept id="8982541288447632557" name="SemAnno.structure.BinaryOperation" flags="ng" index="BinOp_1">
<reference id="8982541288447632559" name="left" index="BinOp_l" />
<reference id="8982541288447632560" name="right" index="BinOp_r" />
</concept>
<concept id="8982541288447632817" name="SemAnno.structure.VariableReference" flags="ng" index="2KtLnB" />
<concept id="8982541288447632837" name="SemAnno.structure.IntegerLiteral" flags="ng" index="2KtLoP" />
<concept id="8982541288447632753" name="SemAnno.structure.Return" flags="ng" index="2KtLkJ">
<child id="8982541288447632754" name="value" index="2KtLkK" />
<concept id="8982541288447632652" name="SemAnno.structure.VariableReference" flags="ng" index="VarRef_1">
<property id="8982541288447632653" name="variableName" index="VarRef_n" />
</concept>
<concept id="8982541288447632492" name="SemAnno.structure.Return" flags="ng" index="Return_1">
<reference id="8982541288447632493" name="value" index="Return_v" />
</concept>
<concept id="8440420766104844840" name="SemAnno.structure.PrimitiveType" flags="ng" index="PrimT_1">
<property id="8982541288447632334" name="kind" index="PrimT_k" />
</concept>
<concept id="8440420766104853480" name="SemAnno.structure.ExpressionStatement" flags="ng" index="ExprStmt_1">
<reference id="8982541288447632525" name="expression" index="ExprStmt_e" />
</concept>
<concept id="8982541288447632596" name="SemAnno.structure.PrimitiveType" flags="ng" index="2KtL_I" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
@@ -45,75 +52,103 @@
</language>
</registry>
<node concept="2Ks9RF" id="Phase1_M001">
<!-- Shared Type nodes (referenced by parameters and functions) -->
<node concept="PrimT_1" id="Type_Int">
<property role="PrimT_k" value="int" />
</node>
<!-- Calculator Module -->
<node concept="Module_1" id="Calc_M001">
<property role="TrG5h" value="Calculator" />
<node concept="2KtM7O" id="Phase1_V001" role="2Ks9RG">
<!-- Variable: PI -->
<node concept="Var_1" id="Calc_V001" role="Module_v">
<property role="TrG5h" value="PI" />
</node>
<node concept="2Ks9S5" id="Phase1_F001" role="2Ks9RH">
<!-- Function: add(x, y) -->
<node concept="Func_1" id="Calc_F001" role="Module_f">
<property role="TrG5h" value="add" />
<node concept="2Ks9Tj" id="Phase1_P001" role="2Ks9SI">
<ref role="Func_rt" node="Type_Int" />
<!-- Parameter x -->
<node concept="Param_1" id="Calc_P001" role="Func_p">
<property role="TrG5h" value="x" />
<node concept="2KtL_I" id="Phase1_T001" role="2Ks9SL">
<property role="TrG5h" value="int" />
</node>
<ref role="Param_t" node="Type_Int" />
</node>
<node concept="2Ks9Tj" id="Phase1_P002" role="2Ks9SI">
<!-- Parameter y -->
<node concept="Param_1" id="Calc_P002" role="Func_p">
<property role="TrG5h" value="y" />
<node concept="2KtL_I" id="Phase1_T002" role="2Ks9SL">
<property role="TrG5h" value="int" />
<ref role="Param_t" node="Type_Int" />
</node>
<!-- Body -->
<node concept="Block_1" id="Calc_B001" role="Func_b">
<!-- result = x + y -->
<node concept="Assign_1" id="Calc_A001" role="Block_s">
<ref role="Assign_t" node="Calc_VR_result" />
<ref role="Assign_v" node="Calc_E001" />
</node>
<!-- return result -->
<node concept="Return_1" id="Calc_R001" role="Block_s">
<ref role="Return_v" node="Calc_VR_return" />
</node>
</node>
<node concept="2KtL_I" id="Phase1_T003" role="2Ks9SK">
<property role="TrG5h" value="int" />
<!-- Expression nodes for add function -->
<node concept="VarRef_1" id="Calc_VR_result">
<property role="VarRef_n" value="result" />
</node>
<node concept="2KtLg9" id="Phase1_B001" role="2Ks9SJ">
<node concept="2KtLgs" id="Phase1_A001" role="2KtLgA">
<property role="TrG5h" value="result" />
<node concept="2KtLkU" id="Phase1_E001" role="2KtLgt">
<property role="TrG5h" value="plus" />
<node concept="2KtLnB" id="Phase1_E002" role="2KtLkW">
<property role="TrG5h" value="x" />
</node>
<node concept="2KtLnB" id="Phase1_E003" role="2KtLkX">
<property role="TrG5h" value="y" />
</node>
</node>
</node>
<node concept="2KtLkJ" id="Phase1_R001" role="2KtLgA">
<node concept="2KtLnB" id="Phase1_E004" role="2KtLkK">
<property role="TrG5h" value="result" />
</node>
</node>
<node concept="BinOp_1" id="Calc_E001">
<ref role="BinOp_l" node="Calc_VR_x" />
<ref role="BinOp_r" node="Calc_VR_y" />
</node>
<node concept="VarRef_1" id="Calc_VR_x">
<property role="VarRef_n" value="x" />
</node>
<node concept="VarRef_1" id="Calc_VR_y">
<property role="VarRef_n" value="y" />
</node>
<node concept="VarRef_1" id="Calc_VR_return">
<property role="VarRef_n" value="result" />
</node>
</node>
<node concept="2Ks9S5" id="Phase1_F002" role="2Ks9RH">
<!-- Function: multiply(a, b) -->
<node concept="Func_1" id="Calc_F002" role="Module_f">
<property role="TrG5h" value="multiply" />
<node concept="2Ks9Tj" id="Phase1_P003" role="2Ks9SI">
<ref role="Func_rt" node="Type_Int" />
<!-- Parameter a -->
<node concept="Param_1" id="Calc_P003" role="Func_p">
<property role="TrG5h" value="a" />
<node concept="2KtL_I" id="Phase1_T004" role="2Ks9SL">
<property role="TrG5h" value="int" />
</node>
<ref role="Param_t" node="Type_Int" />
</node>
<node concept="2Ks9Tj" id="Phase1_P004" role="2Ks9SI">
<!-- Parameter b -->
<node concept="Param_1" id="Calc_P004" role="Func_p">
<property role="TrG5h" value="b" />
<node concept="2KtL_I" id="Phase1_T005" role="2Ks9SL">
<property role="TrG5h" value="int" />
<ref role="Param_t" node="Type_Int" />
</node>
<!-- Body with ExpressionStatement wrapping BinaryOperation -->
<node concept="Block_1" id="Calc_B002" role="Func_b">
<node concept="ExprStmt_1" id="Calc_ES001" role="Block_s">
<ref role="ExprStmt_e" node="Calc_E005" />
</node>
</node>
<node concept="2KtL_I" id="Phase1_T006" role="2Ks9SK">
<property role="TrG5h" value="int" />
<!-- Expression nodes for multiply function -->
<node concept="BinOp_1" id="Calc_E005">
<ref role="BinOp_l" node="Calc_VR_a" />
<ref role="BinOp_r" node="Calc_VR_b" />
</node>
<node concept="2KtLg9" id="Phase1_B002" role="2Ks9SJ">
<node concept="2KtLkU" id="Phase1_E005" role="2KtLgA">
<property role="TrG5h" value="times" />
<node concept="2KtLnB" id="Phase1_E006" role="2KtLkW">
<property role="TrG5h" value="a" />
</node>
<node concept="2KtLnB" id="Phase1_E007" role="2KtLkX">
<property role="TrG5h" value="b" />
</node>
</node>
<node concept="VarRef_1" id="Calc_VR_a">
<property role="VarRef_n" value="a" />
</node>
<node concept="VarRef_1" id="Calc_VR_b">
<property role="VarRef_n" value="b" />
</node>
</node>
</node>