From 57c8bea738990b9cd5efcfbc081249025fa5d608 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 2 Nov 2016 19:50:13 -0700
Subject: push more variable metadata into the model file

---
 src/modelica_parser.lalrpop | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/modelica_parser.lalrpop')

diff --git a/src/modelica_parser.lalrpop b/src/modelica_parser.lalrpop
index 1b7861b..6a1ceaf 100644
--- a/src/modelica_parser.lalrpop
+++ b/src/modelica_parser.lalrpop
@@ -33,11 +33,17 @@ pub model: ModelicaModel = {
         ModelicaModel { name:n, components: cd, connections: cc, equations: se, extends: vec![] },
 };
 
+value_declaration: Expr = {
+    "=" <value:expr> => value
+};
+
+units_declaration: String = {
+    "(" "unit" "=" <units:string_literal> ")" => units
+};
+
 component_declaration: Component = {
-    <prefix:component_prefix?> <specifier:identifier> <name:identifier> string_literal? ";" =>
-        Component { prefix:prefix, specifier:specifier, name:name},
-    <prefix:component_prefix?> <specifier:identifier> <name:identifier> "=" <value:expr> string_literal? ";" =>
-        Component { prefix:prefix, specifier:specifier, name:name},
+    <prefix:component_prefix?> <specifier:identifier> <name:identifier> <units:units_declaration?> <value:value_declaration?> <desc:string_literal?> ";" =>
+        Component { prefix:prefix, specifier:specifier, name:name, description:desc, value:value, units:units },
 };
 
 component_prefix: ComponentPrefix = {
-- 
cgit v1.2.3