Merge pull request #255 from max-schaefer/alias-types

Improve modelling of alias declarations

Author: Sauyon Lee

extractor/cli/go-gen-dbscheme/go-gen-dbscheme.go

@@ -22,10 +22,10 @@ func main() {
 
 	f, err := os.Create(out)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to open file %s for writing.", out)
+		fmt.Fprintf(os.Stderr, "Unable to open file %s for writing.\n", out)
 		os.Exit(1)
 	}
 	dbscheme.PrintDbScheme(f)
 	f.Close()
-	fmt.Printf("Dbscheme written to file %s.", out)
+	fmt.Printf("Dbscheme written to file %s.\n", out)
 }

extractor/dbscheme/tables.go

@@ -441,7 +441,13 @@ var ImportSpecType = SpecKind.NewBranch("@importspec")
 var ValueSpecType = SpecKind.NewBranch("@valuespec")
 
 // TypeSpecType is the type of type declaration specification nodes
-var TypeSpecType = SpecKind.NewBranch("@typespec")
+var TypeSpecType = NewUnionType("@typespec")
+
+// TypeDefSpecType is the type of type declaration specification nodes corresponding to type definitions
+var TypeDefSpecType = SpecKind.NewBranch("@typedefspec", TypeSpecType)
+
+// AliasSpecType is the type of type declaration specification nodes corresponding to alias declarations
+var AliasSpecType = SpecKind.NewBranch("@aliasspec", TypeSpecType)
 
 // ObjectType is the type of objects (that is, declared entities)
 var ObjectType = NewPrimaryKeyType("@object")

extractor/extractor.go

@@ -1149,7 +1149,11 @@ func extractSpec(tw *trap.Writer, spec ast.Spec, parent trap.Label, idx int) {
 		if spec == nil {
 			return
 		}
-		kind = dbscheme.TypeSpecType.Index()
+		if spec.Assign.IsValid() {
+			kind = dbscheme.AliasSpecType.Index()
+		} else {
+			kind = dbscheme.TypeDefSpecType.Index()
+		}
 		extractExpr(tw, spec.Name, lbl, 0)
 		extractExpr(tw, spec.Type, lbl, 1)
 		extractDoc(tw, spec.Doc, lbl)

ql/src/go.dbscheme

@@ -317,7 +317,10 @@ case @decl.kind of
 case @spec.kind of
   0 = @importspec
 | 1 = @valuespec
-| 2 = @typespec;
+| 2 = @typedefspec
+| 3 = @aliasspec;
+
+@typespec = @typedefspec | @aliasspec;
 
 case @object.kind of
   0 = @pkgobject