Merge pull request #38 from mcarmonaa/fix/naming

renaming due to changes in bblfsh/sdk/protocol

Author: juanjux

driver/main.go

@@ -11,10 +11,10 @@ var build string
 
 func main() {
 	d := driver.Driver{
-		Version:           version,
-		Build:             build,
-		UASTParserBuilder: normalizer.UASTParserBuilder,
-		Annotate:          normalizer.AnnotationRules,
+		Version:       version,
+		Build:         build,
+		ParserBuilder: normalizer.ParserBuilder,
+		Annotate:      normalizer.AnnotationRules,
 	}
 	d.Exec()
 }

driver/normalizer/parser.go

@@ -75,22 +75,22 @@ var ToNoder = &native.ObjectToNoder{
 	// FIXME: test[ast_type=Compare].comparators is a list?? (should be "right")
 }
 
-func transformationParser(opts driver.UASTParserOptions) (tr driver.UASTParser, err error) {
+func transformationParser(opts driver.ParserOptions) (tr driver.Parser, err error) {
 	parser, err := native.ExecParser(ToNoder, opts.NativeBin)
 	if err != nil {
 		return tr, err
 	}
 
-	tr = &driver.TransformationUASTParser{
-		UASTParser: parser,
+	tr = &driver.TransformationParser{
+		Parser:         parser,
 		Transformation: driver.FillOffsetFromLineCol,
 	}
 
 	return tr, nil
 }
 
-// UASTParserBuilder creates a parser that transform source code files into *uast.Node.
-func UASTParserBuilder(opts driver.UASTParserOptions) (driver.UASTParser, error) {
+// 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