compiler/checker: make the universal 'string' type a format type

This change adds the 'propertyIsFormatType' property to the type info of the 'string' type.
open2b · Jun 24, 2021 · 4354956 · 4354956
1 parent 9170092
commit 4354956
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/compiler/checker_expressions.go b/compiler/checker_expressions.go
@@ -74,7 +74,7 @@ var universe = typeCheckerScope{
 	"int64":      {t: &typeInfo{Type: reflect.TypeOf(int64(0)), Properties: propertyIsType | propertyUniverse}},
 	"int8":       {t: &typeInfo{Type: reflect.TypeOf(int8(0)), Properties: propertyIsType | propertyUniverse}},
 	"rune":       {t: int32TypeInfo},
-	"string":     {t: &typeInfo{Type: stringType, Properties: propertyIsType | propertyUniverse}},
+	"string":     {t: &typeInfo{Type: stringType, Properties: propertyIsType | propertyIsFormatType | propertyUniverse}},
 	"true":       {t: &typeInfo{Type: boolType, Properties: propertyUniverse | propertyUntyped, Constant: boolConst(true)}},
 	"uint":       {t: &typeInfo{Type: uintType, Properties: propertyIsType | propertyUniverse}},
 	"uint16":     {t: &typeInfo{Type: reflect.TypeOf(uint16(0)), Properties: propertyIsType | propertyUniverse}},
@@ -1891,7 +1891,7 @@ func (tc *typechecker) checkExplicitConversion(expr *ast.Call) *typeInfo {
 	var err error
 
 	switch {
-	case t.IsFormatType() && t.Type != arg.Type && !arg.IsUntypedConstant():
+	case t.Type != stringType && t.IsFormatType() && t.Type != arg.Type && !arg.IsUntypedConstant():
 		err = errTypeConversion
 	case arg.IsConstant():
 		k := t.Type.Kind()

diff --git a/compiler/emitter_expressions.go b/compiler/emitter_expressions.go
@@ -119,7 +119,7 @@ func (em *emitter) _emitExpr(expr ast.Expression, dstType reflect.Type, reg int8
 			}
 			typ := em.typ(expr.Args[0])
 			arg := em.emitExpr(expr.Args[0], typ)
-			markdownToHTML := ti.IsFormatType()
+			markdownToHTML := ti.IsFormatType() && ti.Type != stringType
 			if canEmitDirectly(convertType.Kind(), dstType.Kind()) {
 				if markdownToHTML {
 					em.changeRegisterConvertFormat(false, arg, reg, typ, convertType)