working one-return no-param method calls

evaluationStage.go

@@ -282,6 +282,11 @@ func makeAccessorStage(pair []string) evaluationOperator {
 			}
 
 		default:
+			if right == nil {
+				params = []reflect.Value{}
+				break
+			}
+
 			params = []reflect.Value {reflect.ValueOf(right.(interface{}))}
 		}
 
@@ -291,7 +296,7 @@ func makeAccessorStage(pair []string) evaluationOperator {
 		}
 
 		if len(returned) == 1 {
-			return returned[0], nil
+			return returned[0].Interface(), nil
 		}
 
 		if len(returned) == 2 {

evaluation_test.go

@@ -24,6 +24,23 @@ type EvaluationParameter struct {
 	Value interface{}
 }
 
+type dummyParameterStruct struct {
+	String string
+	Int int
+}
+
+func (this dummyParameterStruct) Func() string {
+	return "funk"
+}
+
+var fooParameter = EvaluationParameter {
+	Name: "foo",
+	Value: dummyParameterStruct {
+		String: "string!",
+		Int: 101,
+	},
+}
+
 func TestNoParameterEvaluation(test *testing.T) {
 
 	evaluationTests := []EvaluationTest{
@@ -1272,6 +1289,34 @@ func TestParameterizedEvaluation(test *testing.T) {
 			},
 			Expected: "foo",
 		},
+		EvaluationTest{
+
+			Name:  "Simple parameter call",
+			Input: "foo.String",
+			Parameters: []EvaluationParameter{fooParameter},
+			Expected: fooParameter.Value.(dummyParameterStruct).String,
+		},
+		EvaluationTest{
+
+			Name:  "Simple parameter function call",
+			Input: "foo.Func()",
+			Parameters: []EvaluationParameter{fooParameter},
+			Expected: "funk",
+		},
+		// EvaluationTest{
+		//
+		// 	Name:  "Simple parameter call",
+		// 	Input: "foo.String == 'hi'",
+		// 	Parameters: []EvaluationParameter{fooParameter},
+		// 	Expected: fooParameter.Value.(dummyParameterStruct).String,
+		// },
+		// EvaluationTest{
+		//
+		// 	Name:  "Simple parameter call with modifier",
+		// 	Input: "foo.String + 'hi'",
+		// 	Parameters: []EvaluationParameter{fooParameter},
+		// 	Expected: fooParameter.Value.(dummyParameterStruct).String,
+		// },
 	}
 
 	runEvaluationTests(evaluationTests, test)

stagePlanner.go

@@ -336,7 +336,7 @@ func planAccessor(stream *tokenStream) (*evaluationStage, error) {
 		return planValue(stream)
 	}
 
-	rightStage, err = planValue(stream)
+	rightStage, err = planTokens(stream)
 	if err != nil {
 		return nil, err
 	}
@@ -365,7 +365,7 @@ func planValue(stream *tokenStream) (*evaluationStage, error) {
 	if !stream.hasNext() {
 		return nil, nil
 	}
-	
+
 	token = stream.next()
 
 	switch token.Kind {