Added stub for complex_try

Author: LadyCailin

src/main/java/com/laytonsmith/core/compiler/keywords/TryKeyword.java

@@ -2,12 +2,9 @@
 
 import com.laytonsmith.core.ParseTree;
 import com.laytonsmith.core.compiler.Keyword;
-import com.laytonsmith.core.constructs.CClassType;
 import com.laytonsmith.core.constructs.CFunction;
 import com.laytonsmith.core.constructs.CKeyword;
 import com.laytonsmith.core.constructs.Construct;
-import com.laytonsmith.core.constructs.IVariable;
-import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.exceptions.ConfigCompileException;
 import java.util.List;
 
@@ -19,7 +16,6 @@ public class TryKeyword extends Keyword {
 
 	// TODO dynamically name this once the class exists.
 	private static final String COMPLEX_TRY = "complex_try";
-	private static final String DEFAULT_EXCEPTION_TYPE = "Exception";
 
 	@Override
 	public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException {
@@ -109,10 +105,6 @@ public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompi
 		return keywordPosition;
 	}
 
-	private Construct getData(List<ParseTree> list, int index){
-		return list.get(index).getData();
-	}
-
 	private boolean nodeIsCatchKeyword(ParseTree node){
 		return
 				(node.getData() instanceof CKeyword ||

src/main/java/com/laytonsmith/core/functions/Exceptions.java

@@ -1,17 +1,21 @@
 package com.laytonsmith.core.functions;
 
 import com.laytonsmith.PureUtilities.Common.StreamUtils;
+import com.laytonsmith.PureUtilities.Version;
 import com.laytonsmith.abstraction.Implementation;
 import com.laytonsmith.annotations.MEnum;
 import com.laytonsmith.annotations.api;
 import com.laytonsmith.annotations.core;
+import com.laytonsmith.annotations.hide;
 import com.laytonsmith.annotations.seealso;
 import com.laytonsmith.core.CHVersion;
 import com.laytonsmith.core.ObjectGenerator;
+import com.laytonsmith.core.Optimizable;
 import com.laytonsmith.core.ParseTree;
 import com.laytonsmith.core.Prefs;
 import com.laytonsmith.core.Script;
 import com.laytonsmith.core.SimpleDocumentation;
+import com.laytonsmith.core.compiler.FileOptions;
 import com.laytonsmith.core.constructs.CArray;
 import com.laytonsmith.core.constructs.CClosure;
 import com.laytonsmith.core.constructs.CNull;
@@ -28,7 +32,9 @@
 import com.laytonsmith.core.exceptions.ConfigRuntimeException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 
@@ -595,4 +601,78 @@ public ExampleScript[] examples() throws ConfigCompileException {
 		}
 
 	}
+
+	@api
+	@hide("In general, this should never be used in the functional syntax, and should only be"
+			+ " automatically generated by the try keyword.")
+	public static class complex_try extends AbstractFunction implements Optimizable {
+
+		@Override
+		public ExceptionType[] thrown() {
+			return new ExceptionType[]{};
+		}
+
+		@Override
+		public boolean isRestricted() {
+			return false;
+		}
+
+		@Override
+		public Boolean runAsync() {
+			return null;
+		}
+
+		@Override
+		public Construct exec(Target t, Environment environment, Construct... args) throws ConfigRuntimeException {
+			return CVoid.VOID;
+		}
+
+		@Override
+		public Construct execs(Target t, Environment env, Script parent, ParseTree... nodes) {
+			// TODO
+			return CVoid.VOID;
+		}
+
+		@Override
+		public String getName() {
+			return "complex_try";
+		}
+
+		@Override
+		public Integer[] numArgs() {
+			return new Integer[]{Integer.MAX_VALUE};
+		}
+
+		@Override
+		public String docs() {
+			return "void {tryBlock, [catchVariable, catchBlock]+, [catchBlock]}";
+		}
+
+		@Override
+		public Version since() {
+			return CHVersion.V3_3_1;
+		}
+
+		@Override
+		public ParseTree optimizeDynamic(Target t, List<ParseTree> children, FileOptions fileOptions) throws ConfigCompileException, ConfigRuntimeException {
+			//TODO
+			return super.optimizeDynamic(t, children, fileOptions); //To change body of generated methods, choose Tools | Templates.
+		}
+
+		@Override
+		public Set<OptimizationOption> optimizationOptions() {
+			return EnumSet.of(OptimizationOption.OPTIMIZE_DYNAMIC);
+		}
+
+		@Override
+		public boolean preResolveVariables() {
+			return false;
+		}
+
+		@Override
+		public boolean useSpecialExec() {
+			return true;
+		}
+
+	}
 }

src/test/java/com/laytonsmith/core/OptimizationTest.java

@@ -281,6 +281,12 @@ public void testSwitch2() throws Exception {
 		assertEquals("assign(@b,subtract(dec(@a),2))", optimize("@b = dec(@a)- 2"));
 	}
 
+	@Test public void testTryCatchKeyword() throws Exception {
+		assertEquals("complex_try(noop(),noop())", optimize("try { noop(); } catch { noop(); }"));
+		// The remainder of these tests should be written once the feature is complete
+		//assertEquals("complex_try(noop(),noop())", optimize("try { noop(); } catch(IOException @e) { noop(); }"));
+	}
+
 
     //TODO: This is a bit ambitious for now, put this back at some point, and then make it pass.
 //    @Test public void testAssign() throws Exception{