From c01d84a4ad7f4d59990f33c0d041a333997f142e Mon Sep 17 00:00:00 2001 From: Tomas Pecka <peckato1@fit.cvut.cz> Date: Mon, 21 Mar 2016 15:30:42 +0100 Subject: [PATCH] fix prev commit --- examples2/automaton/NPDA3.xml | 136 ---------------------------------- examples2/automaton/NPDA4.xml | 101 +++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 136 deletions(-) delete mode 100644 examples2/automaton/NPDA3.xml diff --git a/examples2/automaton/NPDA3.xml b/examples2/automaton/NPDA3.xml deleted file mode 100644 index 803d3dde14..0000000000 --- a/examples2/automaton/NPDA3.xml +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0"?> -<NPDA> - <states> - <PrimitiveLabel><String>q</String></PrimitiveLabel> - </states> - <inputAlphabet> - <LabeledSymbol><PrimitiveLabel><String>a2</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>EOF</String></PrimitiveLabel></LabeledSymbol> - </inputAlphabet> - <stackAlphabet> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>a2_2</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> - </stackAlphabet> - <initialState> - <PrimitiveLabel><String>q</String></PrimitiveLabel> - </initialState> - <initialStackSymbol> - <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> - </initialStackSymbol> - <finalStates> - <PrimitiveLabel><String>f</String></PrimitiveLabel> - </finalStates> - <transitions> - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>a2</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - </push> - </transition> - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>a2</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - <LabeledSymbol><PrimitiveLabel><String>a2_2</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - </push> - </transition> - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>a2</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>a2_2</String></PrimitiveLabel></LabeledSymbol> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - </push> - </transition> - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>a2</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - <LabeledSymbol><PrimitiveLabel><String>a2_2</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>a2_2</String></PrimitiveLabel></LabeledSymbol> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - </push> - </transition> - - - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>a2</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - <LabeledSymbol><PrimitiveLabel><String>a2_2</String></PrimitiveLabel></LabeledSymbol> - </push> - </transition> - - - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> - </push> - </transition> - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> - </push> - </transition> - - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>EOF</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - </push> - </transition> - <transition> - <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> - <input><LabeledSymbol><PrimitiveLabel><String>EOF</String></PrimitiveLabel></LabeledSymbol></input> - <pop> - <LabeledSymbol><PrimitiveLabel><String>a2_2</String></PrimitiveLabel></LabeledSymbol> - <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> - </pop> - <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> - <push> - </push> - </transition> - </transitions> -</NPDA> diff --git a/examples2/automaton/NPDA4.xml b/examples2/automaton/NPDA4.xml index d3c28a81b0..9354697e20 100644 --- a/examples2/automaton/NPDA4.xml +++ b/examples2/automaton/NPDA4.xml @@ -94,9 +94,47 @@ <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> <pop> + <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> </pop> <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> <push> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> </push> </transition> @@ -104,12 +142,75 @@ <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> <pop> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> </pop> <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> <push> <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> </push> </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>Z0</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>a2_1</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> + <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> + <input><LabeledSymbol><PrimitiveLabel><String>b0</String></PrimitiveLabel></LabeledSymbol></input> + <pop> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> + </pop> + <to><PrimitiveLabel><String>q</String></PrimitiveLabel></to> + <push> + <LabeledSymbol><PrimitiveLabel><String>b0_3</String></PrimitiveLabel></LabeledSymbol> + <LabeledSymbol><PrimitiveLabel><String>b0_4</String></PrimitiveLabel></LabeledSymbol> + </push> + </transition> + <transition> <from><PrimitiveLabel><String>q</String></PrimitiveLabel></from> -- GitLab