From bed013e617130f7afd1f90ba57afc160b43c71df Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 12 Apr 2015 17:40:32 +0200
Subject: Implement non-greedy behaviour for short tokens

---
 .../integration/user_defined_syntax/ontologies/math.osml  |  8 ++++----
 .../ontologies/non_greedy_shortform.osml                  | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 testdata/integration/user_defined_syntax/ontologies/non_greedy_shortform.osml

(limited to 'testdata/integration/user_defined_syntax/ontologies')

diff --git a/testdata/integration/user_defined_syntax/ontologies/math.osml b/testdata/integration/user_defined_syntax/ontologies/math.osml
index c864d2b..f10b6a2 100644
--- a/testdata/integration/user_defined_syntax/ontologies/math.osml
+++ b/testdata/integration/user_defined_syntax/ontologies/math.osml
@@ -76,12 +76,12 @@
 	% TODO: Differentiate between lower and upper index vs. power operator?
 	\struct#power[isa=primitive]
 		\syntax
-			\short{^}
+			\short[greedy=false]{^}
 		\field
 			\childRef[ref=primitive]
 	\struct#index[isa=primitive]
 		\syntax
-			\short{_}
+			\short[greedy=false]{_}
 		\field
 			\childRef[ref=primitive]
 
@@ -211,12 +211,12 @@
 			\childRef[ref=upperLimit]
 	\struct#lowerLimit[cardinality={0,1}]
 		\syntax
-			\short{_}
+			\short[greedy=false]{_}
 		\field
 			\childRef[ref=primitive]
 	\struct#upperLimit[cardinality={0,1}]
 		\syntax
-			\short{^}
+			\short[greedy=false]{^}
 		\field
 			\childRef[ref=primitive]
 
diff --git a/testdata/integration/user_defined_syntax/ontologies/non_greedy_shortform.osml b/testdata/integration/user_defined_syntax/ontologies/non_greedy_shortform.osml
new file mode 100644
index 0000000..7a370ac
--- /dev/null
+++ b/testdata/integration/user_defined_syntax/ontologies/non_greedy_shortform.osml
@@ -0,0 +1,15 @@
+\ontology#test
+	\struct#test[root=true]
+		\field
+			\childRef[a]
+			\childRef[b]
+	\struct#a
+		\syntax
+			\short[false]{?}
+		\primitive[optional=true,type=string]
+	\struct#b
+		\syntax
+			\short[false]{+}
+		\field
+			\childRef[a]
+
-- 
cgit v1.2.3