Changed the external/local syntax to default (->) and external (-->).

This is because the default behavior (->) is sometimes like a local and sometimes like an external transition depending on the source and target. This is captured in the renamed DefaultTransitionTest. Forced external transitions (-->) have yet to be implemented.

makina-compiler/gen/xyz/colinholzman/makina/makina.interp

@@ -13,7 +13,7 @@ null
 '('
 ')'
 '->'
-'>'
+'-->'
 null
 null
 null

makina-compiler/gen/xyz/colinholzman/makina/makina.tokens

@@ -28,4 +28,4 @@ COMMENT=17
 '('=11
 ')'=12
 '->'=13
-'>'=14
+'-->'=14

makina-compiler/gen/xyz/colinholzman/makina/makinaBaseListener.java

@@ -1,4 +1,4 @@
-// Generated from /Users/colinholzman/makina/makina-compiler/src/makina.g4 by ANTLR 4.9.1
+// Generated from C:/Users/Colin/Documents/makina/makina-compiler/src\makina.g4 by ANTLR 4.9.1
 package xyz.colinholzman.makina;
 
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -112,25 +112,25 @@ public class makinaBaseListener implements makinaListener {
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterExternalTransition(makinaParser.ExternalTransitionContext ctx) { }
+	@Override public void enterDefaultTransition(makinaParser.DefaultTransitionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitExternalTransition(makinaParser.ExternalTransitionContext ctx) { }
+	@Override public void exitDefaultTransition(makinaParser.DefaultTransitionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void enterLocalTransition(makinaParser.LocalTransitionContext ctx) { }
+	@Override public void enterExternalTransition(makinaParser.ExternalTransitionContext ctx) { }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation does nothing.</p>
 	 */
-	@Override public void exitLocalTransition(makinaParser.LocalTransitionContext ctx) { }
+	@Override public void exitExternalTransition(makinaParser.ExternalTransitionContext ctx) { }
 
 	/**
 	 * {@inheritDoc}

makina-compiler/gen/xyz/colinholzman/makina/makinaBaseVisitor.java

@@ -1,4 +1,4 @@
-// Generated from /Users/colinholzman/makina/makina-compiler/src/makina.g4 by ANTLR 4.9.1
+// Generated from C:/Users/Colin/Documents/makina/makina-compiler/src\makina.g4 by ANTLR 4.9.1
 package xyz.colinholzman.makina;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
@@ -73,12 +73,12 @@ public class makinaBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitExternalTransition(makinaParser.ExternalTransitionContext ctx) { return visitChildren(ctx); }
+	@Override public T visitDefaultTransition(makinaParser.DefaultTransitionContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *
 	 * <p>The default implementation returns the result of calling
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
-	@Override public T visitLocalTransition(makinaParser.LocalTransitionContext ctx) { return visitChildren(ctx); }
+	@Override public T visitExternalTransition(makinaParser.ExternalTransitionContext ctx) { return visitChildren(ctx); }
 }

makina-compiler/gen/xyz/colinholzman/makina/makinaLexer.interp

@@ -13,7 +13,7 @@ null
 '('
 ')'
 '->'
-'>'
+'-->'
 null
 null
 null
@@ -65,4 +65,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 19, 126, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 16, 3, 16, 7, 16, 93, 10, 16, 12, 16, 14, 16, 96, 11, 16, 3, 16, 3, 16, 6, 16, 100, 10, 16, 13, 16, 14, 16, 101, 3, 16, 5, 16, 105, 10, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 7, 18, 115, 10, 18, 12, 18, 14, 18, 118, 11, 18, 3, 18, 5, 18, 121, 10, 18, 3, 18, 3, 18, 3, 18, 3, 18, 2, 2, 19, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 3, 2, 7, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 98, 98, 5, 2, 11, 12, 14, 15, 34, 34, 4, 2, 12, 12, 15, 15, 2, 130, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 3, 37, 3, 2, 2, 2, 5, 45, 3, 2, 2, 2, 7, 47, 3, 2, 2, 2, 9, 55, 3, 2, 2, 2, 11, 61, 3, 2, 2, 2, 13, 63, 3, 2, 2, 2, 15, 65, 3, 2, 2, 2, 17, 67, 3, 2, 2, 2, 19, 73, 3, 2, 2, 2, 21, 78, 3, 2, 2, 2, 23, 81, 3, 2, 2, 2, 25, 83, 3, 2, 2, 2, 27, 85, 3, 2, 2, 2, 29, 88, 3, 2, 2, 2, 31, 104, 3, 2, 2, 2, 33, 106, 3, 2, 2, 2, 35, 110, 3, 2, 2, 2, 37, 38, 7, 111, 2, 2, 38, 39, 7, 99, 2, 2, 39, 40, 7, 101, 2, 2, 40, 41, 7, 106, 2, 2, 41, 42, 7, 107, 2, 2, 42, 43, 7, 112, 2, 2, 43, 44, 7, 103, 2, 2, 44, 4, 3, 2, 2, 2, 45, 46, 7, 61, 2, 2, 46, 6, 3, 2, 2, 2, 47, 48, 7, 107, 2, 2, 48, 49, 7, 112, 2, 2, 49, 50, 7, 107, 2, 2, 50, 51, 7, 118, 2, 2, 51, 52, 7, 107, 2, 2, 52, 53, 7, 99, 2, 2, 53, 54, 7, 110, 2, 2, 54, 8, 3, 2, 2, 2, 55, 56, 7, 117, 2, 2, 56, 57, 7, 118, 2, 2, 57, 58, 7, 99, 2, 2, 58, 59, 7, 118, 2, 2, 59, 60, 7, 103, 2, 2, 60, 10, 3, 2, 2, 2, 61, 62, 7, 125, 2, 2, 62, 12, 3, 2, 2, 2, 63, 64, 7, 127, 2, 2, 64, 14, 3, 2, 2, 2, 65, 66, 7, 48, 2, 2, 66, 16, 3, 2, 2, 2, 67, 68, 7, 103, 2, 2, 68, 69, 7, 112, 2, 2, 69, 70, 7, 118, 2, 2, 70, 71, 7, 116, 2, 2, 71, 72, 7, 123, 2, 2, 72, 18, 3, 2, 2, 2, 73, 74, 7, 103, 2, 2, 74, 75, 7, 122, 2, 2, 75, 76, 7, 107, 2, 2, 76, 77, 7, 118, 2, 2, 77, 20, 3, 2, 2, 2, 78, 79, 7, 113, 2, 2, 79, 80, 7, 112, 2, 2, 80, 22, 3, 2, 2, 2, 81, 82, 7, 42, 2, 2, 82, 24, 3, 2, 2, 2, 83, 84, 7, 43, 2, 2, 84, 26, 3, 2, 2, 2, 85, 86, 7, 47, 2, 2, 86, 87, 7, 64, 2, 2, 87, 28, 3, 2, 2, 2, 88, 89, 7, 64, 2, 2, 89, 30, 3, 2, 2, 2, 90, 94, 9, 2, 2, 2, 91, 93, 9, 3, 2, 2, 92, 91, 3, 2, 2, 2, 93, 96, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 105, 3, 2, 2, 2, 96, 94, 3, 2, 2, 2, 97, 99, 7, 98, 2, 2, 98, 100, 10, 4, 2, 2, 99, 98, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 99, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 105, 7, 98, 2, 2, 104, 90, 3, 2, 2, 2, 104, 97, 3, 2, 2, 2, 105, 32, 3, 2, 2, 2, 106, 107, 9, 5, 2, 2, 107, 108, 3, 2, 2, 2, 108, 109, 8, 17, 2, 2, 109, 34, 3, 2, 2, 2, 110, 111, 7, 49, 2, 2, 111, 112, 7, 49, 2, 2, 112, 116, 3, 2, 2, 2, 113, 115, 10, 6, 2, 2, 114, 113, 3, 2, 2, 2, 115, 118, 3, 2, 2, 2, 116, 114, 3, 2, 2, 2, 116, 117, 3, 2, 2, 2, 117, 120, 3, 2, 2, 2, 118, 116, 3, 2, 2, 2, 119, 121, 7, 15, 2, 2, 120, 119, 3, 2, 2, 2, 120, 121, 3, 2, 2, 2, 121, 122, 3, 2, 2, 2, 122, 123, 7, 12, 2, 2, 123, 124, 3, 2, 2, 2, 124, 125, 8, 18, 2, 2, 125, 36, 3, 2, 2, 2, 8, 2, 94, 101, 104, 116, 120, 3, 8, 2, 2]
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 19, 128, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 7, 16, 95, 10, 16, 12, 16, 14, 16, 98, 11, 16, 3, 16, 3, 16, 6, 16, 102, 10, 16, 13, 16, 14, 16, 103, 3, 16, 5, 16, 107, 10, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 7, 18, 117, 10, 18, 12, 18, 14, 18, 120, 11, 18, 3, 18, 5, 18, 123, 10, 18, 3, 18, 3, 18, 3, 18, 3, 18, 2, 2, 19, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 3, 2, 7, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 3, 2, 98, 98, 5, 2, 11, 12, 14, 15, 34, 34, 4, 2, 12, 12, 15, 15, 2, 132, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 3, 37, 3, 2, 2, 2, 5, 45, 3, 2, 2, 2, 7, 47, 3, 2, 2, 2, 9, 55, 3, 2, 2, 2, 11, 61, 3, 2, 2, 2, 13, 63, 3, 2, 2, 2, 15, 65, 3, 2, 2, 2, 17, 67, 3, 2, 2, 2, 19, 73, 3, 2, 2, 2, 21, 78, 3, 2, 2, 2, 23, 81, 3, 2, 2, 2, 25, 83, 3, 2, 2, 2, 27, 85, 3, 2, 2, 2, 29, 88, 3, 2, 2, 2, 31, 106, 3, 2, 2, 2, 33, 108, 3, 2, 2, 2, 35, 112, 3, 2, 2, 2, 37, 38, 7, 111, 2, 2, 38, 39, 7, 99, 2, 2, 39, 40, 7, 101, 2, 2, 40, 41, 7, 106, 2, 2, 41, 42, 7, 107, 2, 2, 42, 43, 7, 112, 2, 2, 43, 44, 7, 103, 2, 2, 44, 4, 3, 2, 2, 2, 45, 46, 7, 61, 2, 2, 46, 6, 3, 2, 2, 2, 47, 48, 7, 107, 2, 2, 48, 49, 7, 112, 2, 2, 49, 50, 7, 107, 2, 2, 50, 51, 7, 118, 2, 2, 51, 52, 7, 107, 2, 2, 52, 53, 7, 99, 2, 2, 53, 54, 7, 110, 2, 2, 54, 8, 3, 2, 2, 2, 55, 56, 7, 117, 2, 2, 56, 57, 7, 118, 2, 2, 57, 58, 7, 99, 2, 2, 58, 59, 7, 118, 2, 2, 59, 60, 7, 103, 2, 2, 60, 10, 3, 2, 2, 2, 61, 62, 7, 125, 2, 2, 62, 12, 3, 2, 2, 2, 63, 64, 7, 127, 2, 2, 64, 14, 3, 2, 2, 2, 65, 66, 7, 48, 2, 2, 66, 16, 3, 2, 2, 2, 67, 68, 7, 103, 2, 2, 68, 69, 7, 112, 2, 2, 69, 70, 7, 118, 2, 2, 70, 71, 7, 116, 2, 2, 71, 72, 7, 123, 2, 2, 72, 18, 3, 2, 2, 2, 73, 74, 7, 103, 2, 2, 74, 75, 7, 122, 2, 2, 75, 76, 7, 107, 2, 2, 76, 77, 7, 118, 2, 2, 77, 20, 3, 2, 2, 2, 78, 79, 7, 113, 2, 2, 79, 80, 7, 112, 2, 2, 80, 22, 3, 2, 2, 2, 81, 82, 7, 42, 2, 2, 82, 24, 3, 2, 2, 2, 83, 84, 7, 43, 2, 2, 84, 26, 3, 2, 2, 2, 85, 86, 7, 47, 2, 2, 86, 87, 7, 64, 2, 2, 87, 28, 3, 2, 2, 2, 88, 89, 7, 47, 2, 2, 89, 90, 7, 47, 2, 2, 90, 91, 7, 64, 2, 2, 91, 30, 3, 2, 2, 2, 92, 96, 9, 2, 2, 2, 93, 95, 9, 3, 2, 2, 94, 93, 3, 2, 2, 2, 95, 98, 3, 2, 2, 2, 96, 94, 3, 2, 2, 2, 96, 97, 3, 2, 2, 2, 97, 107, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 99, 101, 7, 98, 2, 2, 100, 102, 10, 4, 2, 2, 101, 100, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 101, 3, 2, 2, 2, 103, 104, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 107, 7, 98, 2, 2, 106, 92, 3, 2, 2, 2, 106, 99, 3, 2, 2, 2, 107, 32, 3, 2, 2, 2, 108, 109, 9, 5, 2, 2, 109, 110, 3, 2, 2, 2, 110, 111, 8, 17, 2, 2, 111, 34, 3, 2, 2, 2, 112, 113, 7, 49, 2, 2, 113, 114, 7, 49, 2, 2, 114, 118, 3, 2, 2, 2, 115, 117, 10, 6, 2, 2, 116, 115, 3, 2, 2, 2, 117, 120, 3, 2, 2, 2, 118, 116, 3, 2, 2, 2, 118, 119, 3, 2, 2, 2, 119, 122, 3, 2, 2, 2, 120, 118, 3, 2, 2, 2, 121, 123, 7, 15, 2, 2, 122, 121, 3, 2, 2, 2, 122, 123, 3, 2, 2, 2, 123, 124, 3, 2, 2, 2, 124, 125, 7, 12, 2, 2, 125, 126, 3, 2, 2, 2, 126, 127, 8, 18, 2, 2, 127, 36, 3, 2, 2, 2, 8, 2, 96, 103, 106, 118, 122, 3, 8, 2, 2]

makina-compiler/gen/xyz/colinholzman/makina/makinaLexer.java

@@ -1,4 +1,4 @@
-// Generated from /Users/colinholzman/makina/makina-compiler/src/makina.g4 by ANTLR 4.9.1
+// Generated from C:/Users/Colin/Documents/makina/makina-compiler/src\makina.g4 by ANTLR 4.9.1
 package xyz.colinholzman.makina;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
@@ -39,7 +39,7 @@ private static String[] makeRuleNames() {
 	private static String[] makeLiteralNames() {
 		return new String[] {
 			null, "'machine'", "';'", "'initial'", "'state'", "'{'", "'}'", "'.'", 
-			"'entry'", "'exit'", "'on'", "'('", "')'", "'->'", "'>'"
+			"'entry'", "'exit'", "'on'", "'('", "')'", "'->'", "'-->'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -108,38 +108,38 @@ public makinaLexer(CharStream input) {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\23~\b\1\4\2\t\2\4"+
-		"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
-		"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
-		"\3\2\3\2\3\2\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3"+
-		"\4\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\t\3\t\3\t"+
-		"\3\t\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\f\3\f\3\r\3\r\3\16\3\16\3\16"+
-		"\3\17\3\17\3\20\3\20\7\20]\n\20\f\20\16\20`\13\20\3\20\3\20\6\20d\n\20"+
-		"\r\20\16\20e\3\20\5\20i\n\20\3\21\3\21\3\21\3\21\3\22\3\22\3\22\3\22\7"+
-		"\22s\n\22\f\22\16\22v\13\22\3\22\5\22y\n\22\3\22\3\22\3\22\3\22\2\2\23"+
-		"\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20"+
-		"\37\21!\22#\23\3\2\7\5\2C\\aac|\6\2\62;C\\aac|\3\2bb\5\2\13\f\16\17\""+
-		"\"\4\2\f\f\17\17\2\u0082\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2"+
-		"\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25"+
-		"\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2"+
-		"\2\2\2!\3\2\2\2\2#\3\2\2\2\3%\3\2\2\2\5-\3\2\2\2\7/\3\2\2\2\t\67\3\2\2"+
-		"\2\13=\3\2\2\2\r?\3\2\2\2\17A\3\2\2\2\21C\3\2\2\2\23I\3\2\2\2\25N\3\2"+
-		"\2\2\27Q\3\2\2\2\31S\3\2\2\2\33U\3\2\2\2\35X\3\2\2\2\37h\3\2\2\2!j\3\2"+
-		"\2\2#n\3\2\2\2%&\7o\2\2&\'\7c\2\2\'(\7e\2\2()\7j\2\2)*\7k\2\2*+\7p\2\2"+
-		"+,\7g\2\2,\4\3\2\2\2-.\7=\2\2.\6\3\2\2\2/\60\7k\2\2\60\61\7p\2\2\61\62"+
-		"\7k\2\2\62\63\7v\2\2\63\64\7k\2\2\64\65\7c\2\2\65\66\7n\2\2\66\b\3\2\2"+
-		"\2\678\7u\2\289\7v\2\29:\7c\2\2:;\7v\2\2;<\7g\2\2<\n\3\2\2\2=>\7}\2\2"+
-		">\f\3\2\2\2?@\7\177\2\2@\16\3\2\2\2AB\7\60\2\2B\20\3\2\2\2CD\7g\2\2DE"+
-		"\7p\2\2EF\7v\2\2FG\7t\2\2GH\7{\2\2H\22\3\2\2\2IJ\7g\2\2JK\7z\2\2KL\7k"+
-		"\2\2LM\7v\2\2M\24\3\2\2\2NO\7q\2\2OP\7p\2\2P\26\3\2\2\2QR\7*\2\2R\30\3"+
-		"\2\2\2ST\7+\2\2T\32\3\2\2\2UV\7/\2\2VW\7@\2\2W\34\3\2\2\2XY\7@\2\2Y\36"+
-		"\3\2\2\2Z^\t\2\2\2[]\t\3\2\2\\[\3\2\2\2]`\3\2\2\2^\\\3\2\2\2^_\3\2\2\2"+
-		"_i\3\2\2\2`^\3\2\2\2ac\7b\2\2bd\n\4\2\2cb\3\2\2\2de\3\2\2\2ec\3\2\2\2"+
-		"ef\3\2\2\2fg\3\2\2\2gi\7b\2\2hZ\3\2\2\2ha\3\2\2\2i \3\2\2\2jk\t\5\2\2"+
-		"kl\3\2\2\2lm\b\21\2\2m\"\3\2\2\2no\7\61\2\2op\7\61\2\2pt\3\2\2\2qs\n\6"+
-		"\2\2rq\3\2\2\2sv\3\2\2\2tr\3\2\2\2tu\3\2\2\2ux\3\2\2\2vt\3\2\2\2wy\7\17"+
-		"\2\2xw\3\2\2\2xy\3\2\2\2yz\3\2\2\2z{\7\f\2\2{|\3\2\2\2|}\b\22\2\2}$\3"+
-		"\2\2\2\b\2^ehtx\3\b\2\2";
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\23\u0080\b\1\4\2"+
+		"\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4"+
+		"\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22"+
+		"\t\22\3\2\3\2\3\2\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\4\3\4\3\4\3\4\3\4\3\4"+
+		"\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\t\3"+
+		"\t\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\13\3\13\3\13\3\f\3\f\3\r\3\r\3\16\3\16"+
+		"\3\16\3\17\3\17\3\17\3\17\3\20\3\20\7\20_\n\20\f\20\16\20b\13\20\3\20"+
+		"\3\20\6\20f\n\20\r\20\16\20g\3\20\5\20k\n\20\3\21\3\21\3\21\3\21\3\22"+
+		"\3\22\3\22\3\22\7\22u\n\22\f\22\16\22x\13\22\3\22\5\22{\n\22\3\22\3\22"+
+		"\3\22\3\22\2\2\23\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31"+
+		"\16\33\17\35\20\37\21!\22#\23\3\2\7\5\2C\\aac|\6\2\62;C\\aac|\3\2bb\5"+
+		"\2\13\f\16\17\"\"\4\2\f\f\17\17\2\u0084\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3"+
+		"\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2"+
+		"\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35"+
+		"\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\3%\3\2\2\2\5-\3\2\2\2\7/\3"+
+		"\2\2\2\t\67\3\2\2\2\13=\3\2\2\2\r?\3\2\2\2\17A\3\2\2\2\21C\3\2\2\2\23"+
+		"I\3\2\2\2\25N\3\2\2\2\27Q\3\2\2\2\31S\3\2\2\2\33U\3\2\2\2\35X\3\2\2\2"+
+		"\37j\3\2\2\2!l\3\2\2\2#p\3\2\2\2%&\7o\2\2&\'\7c\2\2\'(\7e\2\2()\7j\2\2"+
+		")*\7k\2\2*+\7p\2\2+,\7g\2\2,\4\3\2\2\2-.\7=\2\2.\6\3\2\2\2/\60\7k\2\2"+
+		"\60\61\7p\2\2\61\62\7k\2\2\62\63\7v\2\2\63\64\7k\2\2\64\65\7c\2\2\65\66"+
+		"\7n\2\2\66\b\3\2\2\2\678\7u\2\289\7v\2\29:\7c\2\2:;\7v\2\2;<\7g\2\2<\n"+
+		"\3\2\2\2=>\7}\2\2>\f\3\2\2\2?@\7\177\2\2@\16\3\2\2\2AB\7\60\2\2B\20\3"+
+		"\2\2\2CD\7g\2\2DE\7p\2\2EF\7v\2\2FG\7t\2\2GH\7{\2\2H\22\3\2\2\2IJ\7g\2"+
+		"\2JK\7z\2\2KL\7k\2\2LM\7v\2\2M\24\3\2\2\2NO\7q\2\2OP\7p\2\2P\26\3\2\2"+
+		"\2QR\7*\2\2R\30\3\2\2\2ST\7+\2\2T\32\3\2\2\2UV\7/\2\2VW\7@\2\2W\34\3\2"+
+		"\2\2XY\7/\2\2YZ\7/\2\2Z[\7@\2\2[\36\3\2\2\2\\`\t\2\2\2]_\t\3\2\2^]\3\2"+
+		"\2\2_b\3\2\2\2`^\3\2\2\2`a\3\2\2\2ak\3\2\2\2b`\3\2\2\2ce\7b\2\2df\n\4"+
+		"\2\2ed\3\2\2\2fg\3\2\2\2ge\3\2\2\2gh\3\2\2\2hi\3\2\2\2ik\7b\2\2j\\\3\2"+
+		"\2\2jc\3\2\2\2k \3\2\2\2lm\t\5\2\2mn\3\2\2\2no\b\21\2\2o\"\3\2\2\2pq\7"+
+		"\61\2\2qr\7\61\2\2rv\3\2\2\2su\n\6\2\2ts\3\2\2\2ux\3\2\2\2vt\3\2\2\2v"+
+		"w\3\2\2\2wz\3\2\2\2xv\3\2\2\2y{\7\17\2\2zy\3\2\2\2z{\3\2\2\2{|\3\2\2\2"+
+		"|}\7\f\2\2}~\3\2\2\2~\177\b\22\2\2\177$\3\2\2\2\b\2`gjvz\3\b\2\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {

makina-compiler/gen/xyz/colinholzman/makina/makinaLexer.tokens

@@ -28,4 +28,4 @@ COMMENT=17
 '('=11
 ')'=12
 '->'=13
-'>'=14
+'-->'=14

makina-compiler/gen/xyz/colinholzman/makina/makinaListener.java

@@ -1,4 +1,4 @@
-// Generated from /Users/colinholzman/makina/makina-compiler/src/makina.g4 by ANTLR 4.9.1
+// Generated from C:/Users/Colin/Documents/makina/makina-compiler/src\makina.g4 by ANTLR 4.9.1
 package xyz.colinholzman.makina;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
@@ -94,27 +94,27 @@ public interface makinaListener extends ParseTreeListener {
 	 */
 	void exitGuard(makinaParser.GuardContext ctx);
 	/**
-	 * Enter a parse tree produced by the {@code externalTransition}
+	 * Enter a parse tree produced by the {@code defaultTransition}
 	 * labeled alternative in {@link makinaParser#target}.
 	 * @param ctx the parse tree
 	 */
-	void enterExternalTransition(makinaParser.ExternalTransitionContext ctx);
+	void enterDefaultTransition(makinaParser.DefaultTransitionContext ctx);
 	/**
-	 * Exit a parse tree produced by the {@code externalTransition}
+	 * Exit a parse tree produced by the {@code defaultTransition}
 	 * labeled alternative in {@link makinaParser#target}.
 	 * @param ctx the parse tree
 	 */
-	void exitExternalTransition(makinaParser.ExternalTransitionContext ctx);
+	void exitDefaultTransition(makinaParser.DefaultTransitionContext ctx);
 	/**
-	 * Enter a parse tree produced by the {@code localTransition}
+	 * Enter a parse tree produced by the {@code externalTransition}
 	 * labeled alternative in {@link makinaParser#target}.
 	 * @param ctx the parse tree
 	 */
-	void enterLocalTransition(makinaParser.LocalTransitionContext ctx);
+	void enterExternalTransition(makinaParser.ExternalTransitionContext ctx);
 	/**
-	 * Exit a parse tree produced by the {@code localTransition}
+	 * Exit a parse tree produced by the {@code externalTransition}
 	 * labeled alternative in {@link makinaParser#target}.
 	 * @param ctx the parse tree
 	 */
-	void exitLocalTransition(makinaParser.LocalTransitionContext ctx);
+	void exitExternalTransition(makinaParser.ExternalTransitionContext ctx);
 }