Merge pull request #81 from juanjux/feature/generic_to_sdk

Use the SDK's skeleton ParserBuilder and set ToNoder.PositionFill

Author: juanjux

driver/normalizer/parser.go

@@ -11,6 +11,7 @@ var ToNoder = &native.ObjectToNoder{
 	EndLineKey:      "end_lineno",
 	ColumnKey:       "col_offset",
 	EndColumnKey:    "end_col_offset",
+	PositionFill:    native.OffsetFromLineCol,
 
 	TokenKeys: map[string]bool{
 		"name": true,
@@ -78,26 +79,25 @@ var ToNoder = &native.ObjectToNoder{
 	// FIXME: test[ast_type=Compare].comparators is a list?? (should be "right")
 }
 
-func transformationParser(opts driver.ParserOptions) (tr driver.Parser, err error) {
-	parser, err := native.ExecParser(ToNoder, opts.NativeBin)
+// ParserBuilder creates a parser that transform source code files into *uast.Node.
+func ParserBuilder(opts driver.ParserOptions) (parser driver.Parser, err error) {
+	parser, err = native.ExecParser(ToNoder, opts.NativeBin)
 	if err != nil {
-		return tr, err
-	}
-
-	tr = &driver.TransformationParser{
-		Parser:         parser,
-		Transformation: driver.FillOffsetFromLineCol,
+		return
 	}
 
-	return tr, nil
-}
-
-// ParserBuilder creates a parser that transform source code files into *uast.Node.
-func ParserBuilder(opts driver.ParserOptions) (driver.Parser, error) {
-	parser, err := transformationParser(opts)
-	if err != nil {
-		return nil, err
+	switch ToNoder.PositionFill {
+	case native.OffsetFromLineCol:
+		parser = &driver.TransformationParser{
+			Parser:         parser,
+			Transformation: driver.FillOffsetFromLineCol,
+		}
+	case native.LineColFromOffset:
+		parser = &driver.TransformationParser{
+			Parser:         parser,
+			Transformation: driver.FillLineColFromOffset,
+		}
 	}
 
-	return parser, nil
+	return
 }