Moved GEL stuff (gridworks expression language) into gel package.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@158 7d457c2a-affb-35e4-300a-418c747d4874

src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java

@@ -14,7 +14,7 @@ import com.metaweb.gridworks.browsing.FilteredRows;
 import com.metaweb.gridworks.browsing.filters.ExpressionEqualRowFilter;
 import com.metaweb.gridworks.browsing.filters.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
-import com.metaweb.gridworks.expr.Parser;
+import com.metaweb.gridworks.gel.Parser;
 import com.metaweb.gridworks.model.Project;
 
 public class ListFacet implements Facet {

src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java

@@ -10,7 +10,7 @@ import com.metaweb.gridworks.browsing.FilteredRows;
 import com.metaweb.gridworks.browsing.filters.ExpressionNumberComparisonRowFilter;
 import com.metaweb.gridworks.browsing.filters.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
-import com.metaweb.gridworks.expr.Parser;
+import com.metaweb.gridworks.gel.Parser;
 import com.metaweb.gridworks.model.Column;
 import com.metaweb.gridworks.model.Project;
 

src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java

@@ -10,7 +10,7 @@ import com.metaweb.gridworks.browsing.FilteredRows;
 import com.metaweb.gridworks.browsing.filters.ExpressionStringComparisonRowFilter;
 import com.metaweb.gridworks.browsing.filters.RowFilter;
 import com.metaweb.gridworks.expr.Evaluable;
-import com.metaweb.gridworks.expr.ast.VariableExpr;
+import com.metaweb.gridworks.gel.ast.VariableExpr;
 import com.metaweb.gridworks.model.Project;
 
 public class TextSearchFacet implements Facet {

src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java

@@ -11,9 +11,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.JSONWriter;
 
 import com.metaweb.gridworks.commands.Command;
-import com.metaweb.gridworks.expr.Control;
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Control;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class GetExpressionLanguageInfoCommand extends Command {
 	

src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java

@@ -16,8 +16,8 @@ import com.metaweb.gridworks.expr.EvalError;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
 import com.metaweb.gridworks.expr.HasFields;
-import com.metaweb.gridworks.expr.Parser;
 import com.metaweb.gridworks.expr.ParsingException;
+import com.metaweb.gridworks.gel.Parser;
 import com.metaweb.gridworks.model.Cell;
 import com.metaweb.gridworks.model.Project;
 import com.metaweb.gridworks.model.Row;

src/main/java/com/metaweb/gridworks/expr/functions/Get.java

@@ -5,8 +5,8 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.HasFields;
+import com.metaweb.gridworks.gel.Function;
 
 public class Get implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/Length.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Length implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/Slice.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Slice implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/ToDate.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.util.CalendarParser;
 import com.metaweb.gridworks.expr.util.CalendarParserException;
+import com.metaweb.gridworks.gel.Function;
 
 public class ToDate implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/ToNumber.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class ToNumber implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/ToString.java

@@ -7,7 +7,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class ToString implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/arrays/Join.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Join implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/arrays/Reverse.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Reverse implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/arrays/Sort.java

@@ -6,9 +6,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Sort implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/booleans/And.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class And implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/booleans/Not.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Not implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/booleans/Or.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Or implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/date/Now.java

@@ -6,7 +6,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Now implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Ceil.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Ceil implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Exp.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Exp implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Floor.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Floor implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Ln.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Ln implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Log.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Log implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Max.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Max implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Min.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Min implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Mod.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Mod implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Pow.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Pow implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/math/Round.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Round implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Chomp.java

@@ -6,7 +6,7 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Chomp implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Contains.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Contains implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Diff.java

@@ -7,9 +7,9 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.util.CalendarParser;
 import com.metaweb.gridworks.expr.util.CalendarParserException;
+import com.metaweb.gridworks.gel.Function;
 
 public class Diff implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/EndsWith.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class EndsWith implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Fingerprint.java

@@ -8,9 +8,9 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Fingerprint implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/IndexOf.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class IndexOf implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/LastIndexOf.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class LastIndexOf implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/MD5.java

@@ -6,9 +6,9 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class MD5 implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Partition.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Partition implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Phonetic.java

@@ -8,9 +8,9 @@ import org.apache.commons.codec.language.Soundex;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Phonetic implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/RPartition.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class RPartition implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Reinterpret.java

@@ -6,9 +6,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Reinterpret implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Replace.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Replace implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceChars.java

@@ -6,9 +6,9 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class ReplaceChars implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/ReplaceRegexp.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class ReplaceRegexp implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/SHA1.java

@@ -6,9 +6,9 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class SHA1 implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Split.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Split implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/SplitByCharType.java

@@ -6,9 +6,9 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class SplitByCharType implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/StartsWith.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class StartsWith implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/ToLowercase.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class ToLowercase implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/ToTitlecase.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class ToTitlecase implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/ToUppercase.java

@@ -5,9 +5,9 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
-import com.metaweb.gridworks.expr.Function;
 import com.metaweb.gridworks.expr.EvalError;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class ToUppercase implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Trim.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Trim implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Unescape.java

@@ -8,9 +8,9 @@ import org.apache.commons.lang.StringEscapeUtils;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.Function;
 
 public class Unescape implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/Unicode.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class Unicode implements Function {
 

src/main/java/com/metaweb/gridworks/expr/functions/strings/UnicodeType.java

@@ -5,7 +5,7 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class UnicodeType implements Function {
 

src/main/java/com/metaweb/gridworks/gel/Control.java

@@ -1,8 +1,9 @@
-package com.metaweb.gridworks.expr;
+package com.metaweb.gridworks.gel;
 
 import java.util.Properties;
 
 import com.metaweb.gridworks.Jsonizable;
+import com.metaweb.gridworks.expr.Evaluable;
 
 public interface Control extends Jsonizable {
 	public Object call(Properties bindings, Evaluable[] args);

src/main/java/com/metaweb/gridworks/gel/ControlFunctionRegistry.java

@@ -1,19 +1,10 @@
-package com.metaweb.gridworks.expr;
+package com.metaweb.gridworks.gel;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import com.metaweb.gridworks.expr.controls.ForEach;
-import com.metaweb.gridworks.expr.controls.ForNonBlank;
-import com.metaweb.gridworks.expr.controls.If;
-import com.metaweb.gridworks.expr.controls.IsBlank;
-import com.metaweb.gridworks.expr.controls.IsNonBlank;
-import com.metaweb.gridworks.expr.controls.IsNotNull;
-import com.metaweb.gridworks.expr.controls.IsNull;
-import com.metaweb.gridworks.expr.controls.IsNumeric;
-import com.metaweb.gridworks.expr.controls.With;
 import com.metaweb.gridworks.expr.functions.Get;
 import com.metaweb.gridworks.expr.functions.Length;
 import com.metaweb.gridworks.expr.functions.Slice;
@@ -61,6 +52,15 @@ import com.metaweb.gridworks.expr.functions.strings.Trim;
 import com.metaweb.gridworks.expr.functions.strings.Unescape;
 import com.metaweb.gridworks.expr.functions.strings.Unicode;
 import com.metaweb.gridworks.expr.functions.strings.UnicodeType;
+import com.metaweb.gridworks.gel.controls.ForEach;
+import com.metaweb.gridworks.gel.controls.ForNonBlank;
+import com.metaweb.gridworks.gel.controls.If;
+import com.metaweb.gridworks.gel.controls.IsBlank;
+import com.metaweb.gridworks.gel.controls.IsNonBlank;
+import com.metaweb.gridworks.gel.controls.IsNotNull;
+import com.metaweb.gridworks.gel.controls.IsNull;
+import com.metaweb.gridworks.gel.controls.IsNumeric;
+import com.metaweb.gridworks.gel.controls.With;
 
 public class ControlFunctionRegistry {
 

src/main/java/com/metaweb/gridworks/gel/Function.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr;
+package com.metaweb.gridworks.gel;
 
 import java.util.Properties;
 

src/main/java/com/metaweb/gridworks/gel/Parser.java

@@ -1,17 +1,19 @@
-package com.metaweb.gridworks.expr;
+package com.metaweb.gridworks.gel;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import com.metaweb.gridworks.expr.Scanner.NumberToken;
-import com.metaweb.gridworks.expr.Scanner.Token;
-import com.metaweb.gridworks.expr.Scanner.TokenType;
-import com.metaweb.gridworks.expr.ast.ControlCallExpr;
-import com.metaweb.gridworks.expr.ast.FieldAccessorExpr;
-import com.metaweb.gridworks.expr.ast.FunctionCallExpr;
-import com.metaweb.gridworks.expr.ast.LiteralExpr;
-import com.metaweb.gridworks.expr.ast.OperatorCallExpr;
-import com.metaweb.gridworks.expr.ast.VariableExpr;
+import com.metaweb.gridworks.expr.Evaluable;
+import com.metaweb.gridworks.expr.ParsingException;
+import com.metaweb.gridworks.gel.Scanner.NumberToken;
+import com.metaweb.gridworks.gel.Scanner.Token;
+import com.metaweb.gridworks.gel.Scanner.TokenType;
+import com.metaweb.gridworks.gel.ast.ControlCallExpr;
+import com.metaweb.gridworks.gel.ast.FieldAccessorExpr;
+import com.metaweb.gridworks.gel.ast.FunctionCallExpr;
+import com.metaweb.gridworks.gel.ast.LiteralExpr;
+import com.metaweb.gridworks.gel.ast.OperatorCallExpr;
+import com.metaweb.gridworks.gel.ast.VariableExpr;
 
 public class Parser {
 	protected Scanner 	_scanner;

src/main/java/com/metaweb/gridworks/gel/Scanner.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr;
+package com.metaweb.gridworks.gel;
 
 public class Scanner {
 	static public enum TokenType {

src/main/java/com/metaweb/gridworks/gel/ast/ControlCallExpr.java

@@ -1,9 +1,9 @@
-package com.metaweb.gridworks.expr.ast;
+package com.metaweb.gridworks.gel.ast;
 
 import java.util.Properties;
 
-import com.metaweb.gridworks.expr.Control;
 import com.metaweb.gridworks.expr.Evaluable;
+import com.metaweb.gridworks.gel.Control;
 
 public class ControlCallExpr implements Evaluable {
 	final protected Evaluable[] _args;

src/main/java/com/metaweb/gridworks/gel/ast/FieldAccessorExpr.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.ast;
+package com.metaweb.gridworks.gel.ast;
 
 import java.util.Properties;
 

src/main/java/com/metaweb/gridworks/gel/ast/FunctionCallExpr.java

@@ -1,10 +1,10 @@
-package com.metaweb.gridworks.expr.ast;
+package com.metaweb.gridworks.gel.ast;
 
 import java.util.Properties;
 
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
-import com.metaweb.gridworks.expr.Function;
+import com.metaweb.gridworks.gel.Function;
 
 public class FunctionCallExpr implements Evaluable {
 	final protected Evaluable[] _args;

src/main/java/com/metaweb/gridworks/gel/ast/LiteralExpr.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.ast;
+package com.metaweb.gridworks.gel.ast;
 
 import java.util.Properties;
 

src/main/java/com/metaweb/gridworks/gel/ast/OperatorCallExpr.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.ast;
+package com.metaweb.gridworks.gel.ast;
 
 import java.util.Properties;
 

src/main/java/com/metaweb/gridworks/gel/ast/VariableExpr.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.ast;
+package com.metaweb.gridworks.gel.ast;
 
 import java.util.Properties;
 

src/main/java/com/metaweb/gridworks/gel/controls/ForEach.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,12 +7,12 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Control;
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.EvalError;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
-import com.metaweb.gridworks.expr.ast.VariableExpr;
+import com.metaweb.gridworks.gel.Control;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.ast.VariableExpr;
 
 public class ForEach implements Control {
     public String checkArguments(Evaluable[] args) {

src/main/java/com/metaweb/gridworks/gel/controls/ForNonBlank.java

@@ -1,15 +1,15 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import java.util.Properties;
 
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Control;
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
-import com.metaweb.gridworks.expr.ast.VariableExpr;
+import com.metaweb.gridworks.gel.Control;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.ast.VariableExpr;
 
 public class ForNonBlank implements Control {
     public String checkArguments(Evaluable[] args) {

src/main/java/com/metaweb/gridworks/gel/controls/If.java

@@ -1,14 +1,14 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import java.util.Properties;
 
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Control;
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
+import com.metaweb.gridworks.gel.Control;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
 
 public class If implements Control {
     public String checkArguments(Evaluable[] args) {

src/main/java/com/metaweb/gridworks/gel/controls/IsBlank.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import com.metaweb.gridworks.expr.ExpressionUtils;
 

src/main/java/com/metaweb/gridworks/gel/controls/IsNonBlank.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import com.metaweb.gridworks.expr.ExpressionUtils;
 

src/main/java/com/metaweb/gridworks/gel/controls/IsNotNull.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 public class IsNotNull extends IsTest {
     @Override

src/main/java/com/metaweb/gridworks/gel/controls/IsNull.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 public class IsNull extends IsTest {
     @Override

src/main/java/com/metaweb/gridworks/gel/controls/IsNumeric.java

@@ -1,4 +1,4 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import org.apache.commons.lang.StringUtils;
 

src/main/java/com/metaweb/gridworks/gel/controls/IsTest.java

@@ -1,13 +1,13 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import java.util.Properties; 
 
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Control;
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.Evaluable;
+import com.metaweb.gridworks.gel.Control;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
 
 abstract class IsTest implements Control {
     public String checkArguments(Evaluable[] args) {

src/main/java/com/metaweb/gridworks/gel/controls/With.java

@@ -1,14 +1,14 @@
-package com.metaweb.gridworks.expr.controls;
+package com.metaweb.gridworks.gel.controls;
 
 import java.util.Properties; 
 
 import org.json.JSONException;
 import org.json.JSONWriter;
 
-import com.metaweb.gridworks.expr.Control;
-import com.metaweb.gridworks.expr.ControlFunctionRegistry;
 import com.metaweb.gridworks.expr.Evaluable;
-import com.metaweb.gridworks.expr.ast.VariableExpr;
+import com.metaweb.gridworks.gel.Control;
+import com.metaweb.gridworks.gel.ControlFunctionRegistry;
+import com.metaweb.gridworks.gel.ast.VariableExpr;
 
 public class With implements Control {
     public String checkArguments(Evaluable[] args) {

src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java

@@ -13,7 +13,7 @@ import com.metaweb.gridworks.browsing.FilteredRows;
 import com.metaweb.gridworks.browsing.RowVisitor;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
-import com.metaweb.gridworks.expr.Parser;
+import com.metaweb.gridworks.gel.Parser;
 import com.metaweb.gridworks.history.Change;
 import com.metaweb.gridworks.history.HistoryEntry;
 import com.metaweb.gridworks.model.AbstractOperation;

src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java

@@ -10,7 +10,7 @@ import org.json.JSONWriter;
 import com.metaweb.gridworks.browsing.RowVisitor;
 import com.metaweb.gridworks.expr.Evaluable;
 import com.metaweb.gridworks.expr.ExpressionUtils;
-import com.metaweb.gridworks.expr.Parser;
+import com.metaweb.gridworks.gel.Parser;
 import com.metaweb.gridworks.model.AbstractOperation;
 import com.metaweb.gridworks.model.Cell;
 import com.metaweb.gridworks.model.Column;