Merge pull request #397 from ericevenchick/master

dsl support for stringjoin struct repr and stringprefix union repr

schema/dmt/compile.go

@@ -132,7 +132,7 @@ func spawnType(ts *schema.TypeSystem, name schema.TypeName, defn TypeDefn) (sche
 			typ.Representation.ListRepresentation_List != nil:
 			// default behavior
 		default:
-			return nil, fmt.Errorf("TODO: support other map repr in schema package")
+			return nil, fmt.Errorf("TODO: support other list repr in schema package")
 		}
 		return schema.SpawnList(name,
 			*typ.ValueType.TypeName,
@@ -147,6 +147,8 @@ func spawnType(ts *schema.TypeSystem, name schema.TypeName, defn TypeDefn) (sche
 		case typ.Representation == nil ||
 			typ.Representation.MapRepresentation_Map != nil:
 			// default behavior
+		case typ.Representation.MapRepresentation_Stringpairs != nil:
+			return nil, fmt.Errorf("TODO: support stringpairs map repr in schema package")
 		default:
 			return nil, fmt.Errorf("TODO: support other map repr in schema package")
 		}
@@ -221,6 +223,12 @@ func spawnType(ts *schema.TypeSystem, name schema.TypeName, defn TypeDefn) (sche
 				break
 			}
 			return nil, fmt.Errorf("TODO: support for tuples with field orders in the schema package")
+		case typ.Representation.StructRepresentation_Stringjoin != nil:
+			join := typ.Representation.StructRepresentation_Stringjoin.Join
+			if join == "" {
+				return nil, fmt.Errorf("stringjoin has empty join value")
+			}
+			repr = schema.SpawnStructRepresentationStringjoin(join)
 		default:
 			return nil, fmt.Errorf("TODO: support other struct repr in schema package")
 		}
@@ -287,6 +295,12 @@ func spawnType(ts *schema.TypeSystem, name schema.TypeName, defn TypeDefn) (sche
 				}
 			}
 			repr = schema.SpawnUnionRepresentationKeyed(table)
+		case typ.Representation.UnionRepresentation_StringPrefix != nil:
+			prefixes := typ.Representation.UnionRepresentation_StringPrefix.Prefixes
+			for _, key := range prefixes.Keys {
+				validMember(prefixes.Values[key])
+			}
+			repr = schema.SpawnUnionRepresentationStringprefix("", prefixes.Values)
 		default:
 			return nil, fmt.Errorf("TODO: support other union repr in schema package")
 		}

schema/dsl/parse.go

@@ -228,6 +228,35 @@ func (p *parser) consumeString() (string, error) {
 	return tok[1 : len(tok)-1], nil
 }
 
+func (p *parser) consumeStringMap() (map[string]string, error) {
+	result := map[string]string{}
+loop:
+	for {
+		tok, err := p.peekToken()
+		if err != nil {
+			return result, err
+		}
+		switch tok {
+		case "{":
+			p.consumePeeked()
+		case "}":
+			p.consumePeeked()
+			break loop
+		default:
+			key, err := p.consumeName()
+			if err != nil {
+				return result, err
+			}
+			value, err := p.consumeString()
+			if err != nil {
+				return result, err
+			}
+			result[key] = value
+		}
+	}
+	return result, nil
+}
+
 func (p *parser) consumeRequired(tok string) error {
 	got, err := p.consumeToken()
 	if err != nil {
@@ -425,6 +454,19 @@ func (p *parser) typeStruct() (*dmt.TypeDefnStruct, error) {
 		defn.Representation.StructRepresentation_Tuple = &dmt.StructRepresentation_Tuple{}
 		return defn, nil
 		// TODO: support custom fieldorder
+	case "stringjoin":
+		optMap, err := p.consumeStringMap()
+		if err != nil {
+			return nil, err
+		}
+		join, hasJoin := optMap["join"]
+		if !hasJoin {
+			return nil, p.errf("no join value provided for stringjoin repr")
+		}
+		defn.Representation.StructRepresentation_Stringjoin = &dmt.StructRepresentation_Stringjoin{
+			Join: join,
+		}
+		return defn, nil
 	default:
 		return nil, p.errf("unknown struct repr: %q", reprName)
 	}
@@ -513,7 +555,6 @@ func (p *parser) typeMap() (*dmt.TypeDefnMap, error) {
 		return defn, err
 	}
 
-	// TODO: repr
 	return defn, nil
 }
 
@@ -573,6 +614,24 @@ func (p *parser) typeUnion() (*dmt.TypeDefnUnion, error) {
 			mapAppend(repr, key, defn.Members[i])
 		}
 		defn.Representation.UnionRepresentation_Kinded = repr
+	case "stringprefix":
+		repr := &dmt.UnionRepresentation_StringPrefix{
+			Prefixes: dmt.Map__String__TypeName{
+				Values: map[string]string{},
+			},
+		}
+		for i, key := range reprKeys {
+			// unquote prefix string
+			if len(key) < 2 || key[0] != '"' || key[len(key)-1] != '"' {
+				return nil, p.errf("invalid stringprefix %q", key)
+			}
+			key = key[1 : len(key)-1]
+
+			// add prefix to prefixes map
+			repr.Prefixes.Keys = append(repr.Prefixes.Keys, key)
+			repr.Prefixes.Values[key] = *defn.Members[i].TypeName
+		}
+		defn.Representation.UnionRepresentation_StringPrefix = repr
 	default:
 		return nil, p.errf("TODO: union repr %q", reprName)
 	}