diff --git a/src/archive/tar/reader_test.go b/src/archive/tar/reader_test.go index f153b668deff8..0fc29eaab6f81 100644 --- a/src/archive/tar/reader_test.go +++ b/src/archive/tar/reader_test.go @@ -378,9 +378,9 @@ func TestReader(t *testing.T) { "security.selinux": "unconfined_u:object_r:default_t:s0\x00", }, PAXRecords: map[string]string{ - "mtime": "1386065770.449252304", - "atime": "1389782991.41987522", - "ctime": "1386065770.449252304", + "mtime": "1386065770.449252304", + "atime": "1389782991.41987522", + "ctime": "1386065770.449252304", "SCHILY.xattr.security.selinux": "unconfined_u:object_r:default_t:s0\x00", }, Format: FormatPAX, diff --git a/src/cmd/compile/fmt_test.go b/src/cmd/compile/fmt_test.go index 531298a216410..9d47b04b1c904 100644 --- a/src/cmd/compile/fmt_test.go +++ b/src/cmd/compile/fmt_test.go @@ -702,32 +702,32 @@ var knownFormats = map[string]string{ "interface{} %v": "", "map[*cmd/compile/internal/gc.Node]*cmd/compile/internal/ssa.Value %v": "", "map[cmd/compile/internal/ssa.ID]uint32 %v": "", - "reflect.Type %s": "", - "rune %#U": "", - "rune %c": "", - "string %-*s": "", - "string %-16s": "", - "string %-6s": "", - "string %.*s": "", - "string %q": "", - "string %s": "", - "string %v": "", - "time.Duration %d": "", - "time.Duration %v": "", - "uint %04x": "", - "uint %5d": "", - "uint %d": "", - "uint %x": "", - "uint16 %d": "", - "uint16 %v": "", - "uint16 %x": "", - "uint32 %d": "", - "uint32 %v": "", - "uint32 %x": "", - "uint64 %08x": "", - "uint64 %d": "", - "uint64 %x": "", - "uint8 %d": "", - "uint8 %x": "", - "uintptr %d": "", + "reflect.Type %s": "", + "rune %#U": "", + "rune %c": "", + "string %-*s": "", + "string %-16s": "", + "string %-6s": "", + "string %.*s": "", + "string %q": "", + "string %s": "", + "string %v": "", + "time.Duration %d": "", + "time.Duration %v": "", + "uint %04x": "", + "uint %5d": "", + "uint %d": "", + "uint %x": "", + "uint16 %d": "", + "uint16 %v": "", + "uint16 %x": "", + "uint32 %d": "", + "uint32 %v": "", + "uint32 %x": "", + "uint64 %08x": "", + "uint64 %d": "", + "uint64 %x": "", + "uint8 %d": "", + "uint8 %x": "", + "uintptr %d": "", } diff --git a/src/cmd/doc/doc_test.go b/src/cmd/doc/doc_test.go index e68e95f3fb511..fdf6b8cf36b50 100644 --- a/src/cmd/doc/doc_test.go +++ b/src/cmd/doc/doc_test.go @@ -123,7 +123,7 @@ var tests = []test{ `var MultiLineVar = map\[struct{ ... }\]struct{ ... }{ ... }`, // Multi line variable. `func MultiLineFunc\(x interface{ ... }\) \(r struct{ ... }\)`, // Multi line function. `var LongLine = newLongLine\(("someArgument[1-4]", ){4}...\)`, // Long list of arguments. - `type T1 = T2`, // Type alias + `type T1 = T2`, // Type alias }, []string{ `const internalConstant = 2`, // No internal constants. diff --git a/src/cmd/pprof/pprof.go b/src/cmd/pprof/pprof.go index 42e310043d465..b84af3a7f2f74 100644 --- a/src/cmd/pprof/pprof.go +++ b/src/cmd/pprof/pprof.go @@ -76,8 +76,8 @@ func getProfile(source string, timeout time.Duration) (*profile.Profile, error) client := &http.Client{ Transport: &http.Transport{ ResponseHeaderTimeout: timeout + 5*time.Second, - Proxy: http.ProxyFromEnvironment, - TLSClientConfig: tlsConfig, + Proxy: http.ProxyFromEnvironment, + TLSClientConfig: tlsConfig, }, } resp, err := client.Get(source) diff --git a/src/cmd/vet/testdata/composite.go b/src/cmd/vet/testdata/composite.go index 3fe3eac78cb38..ce9bc78e49e19 100644 --- a/src/cmd/vet/testdata/composite.go +++ b/src/cmd/vet/testdata/composite.go @@ -115,6 +115,6 @@ var goodNamedPointerSliceLiteral = []*unicode.CaseRange{ &unicode.CaseRange{Lo: 1, Hi: 2}, } var badNamedPointerSliceLiteral = []*unicode.CaseRange{ - {1, 2}, // ERROR "unkeyed fields" + {1, 2}, // ERROR "unkeyed fields" &unicode.CaseRange{1, 2}, // ERROR "unkeyed fields" } diff --git a/src/crypto/tls/handshake_server_test.go b/src/crypto/tls/handshake_server_test.go index 69e6cc9bd67fb..67160213fbe41 100644 --- a/src/crypto/tls/handshake_server_test.go +++ b/src/crypto/tls/handshake_server_test.go @@ -194,9 +194,9 @@ func TestDontSelectRSAWithECDSAKey(t *testing.T) { func TestRenegotiationExtension(t *testing.T) { clientHello := &clientHelloMsg{ - vers: VersionTLS12, - compressionMethods: []uint8{compressionNone}, - random: make([]byte, 32), + vers: VersionTLS12, + compressionMethods: []uint8{compressionNone}, + random: make([]byte, 32), secureRenegotiationSupported: true, cipherSuites: []uint16{TLS_RSA_WITH_RC4_128_SHA}, } @@ -992,7 +992,7 @@ func TestFallbackSCSV(t *testing.T) { name: "FallbackSCSV", config: &serverConfig, // OpenSSL 1.0.1j is needed for the -fallback_scsv option. - command: []string{"openssl", "s_client", "-fallback_scsv"}, + command: []string{"openssl", "s_client", "-fallback_scsv"}, expectHandshakeErrorIncluding: "inappropriate protocol fallback", } runServerTestTLS11(t, test) diff --git a/src/crypto/x509/name_constraints_test.go b/src/crypto/x509/name_constraints_test.go index 95d55fd7619b4..e89e70d8746db 100644 --- a/src/crypto/x509/name_constraints_test.go +++ b/src/crypto/x509/name_constraints_test.go @@ -1595,7 +1595,7 @@ func makeConstraintsCACert(constraints constraintsSpec, name string, key *ecdsa. NotAfter: time.Unix(2000, 0), KeyUsage: KeyUsageCertSign, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } if err := addConstraintsToTemplate(constraints, template); err != nil { @@ -1633,7 +1633,7 @@ func makeConstraintsLeafCert(leaf leafSpec, key *ecdsa.PrivateKey, parent *Certi NotAfter: time.Unix(2000, 0), KeyUsage: KeyUsageDigitalSignature, BasicConstraintsValid: true, - IsCA: false, + IsCA: false, } for _, name := range leaf.sans { diff --git a/src/crypto/x509/x509.go b/src/crypto/x509/x509.go index 34eb8b0105ee4..f473d7868f13f 100644 --- a/src/crypto/x509/x509.go +++ b/src/crypto/x509/x509.go @@ -2594,7 +2594,7 @@ func ParseCertificateRequest(asn1Data []byte) (*CertificateRequest, error) { func parseCertificateRequest(in *certificateRequest) (*CertificateRequest, error) { out := &CertificateRequest{ - Raw: in.Raw, + Raw: in.Raw, RawTBSCertificateRequest: in.TBSCSR.Raw, RawSubjectPublicKeyInfo: in.TBSCSR.PublicKey.Raw, RawSubject: in.TBSCSR.Subject.FullBytes, diff --git a/src/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go index 388156e209726..5d255eccd78d6 100644 --- a/src/crypto/x509/x509_test.go +++ b/src/crypto/x509/x509_test.go @@ -551,7 +551,7 @@ func TestCreateSelfSignedCertificate(t *testing.T) { UnknownExtKeyUsage: testUnknownExtKeyUsage, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, OCSPServer: []string{"http://ocsp.example.com"}, IssuingCertificateURL: []string{"http://crt.example.com/ca1.crt"}, @@ -1399,7 +1399,7 @@ func TestMaxPathLen(t *testing.T) { NotAfter: time.Unix(100000, 0), BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } cert1 := serialiseAndParse(t, template) @@ -1440,8 +1440,8 @@ func TestNoAuthorityKeyIdInSelfSignedCert(t *testing.T) { NotAfter: time.Unix(100000, 0), BasicConstraintsValid: true, - IsCA: true, - SubjectKeyId: []byte{1, 2, 3, 4}, + IsCA: true, + SubjectKeyId: []byte{1, 2, 3, 4}, } if cert := serialiseAndParse(t, template); len(cert.AuthorityKeyId) != 0 { diff --git a/src/encoding/json/decode_test.go b/src/encoding/json/decode_test.go index ab83b81bb3958..259c8e7cd54da 100644 --- a/src/encoding/json/decode_test.go +++ b/src/encoding/json/decode_test.go @@ -615,9 +615,9 @@ var unmarshalTests = []unmarshalTest{ out: S5{S8: S8{S9: S9{Y: 2}}}, }, { - in: `{"X": 1,"Y":2}`, - ptr: new(S5), - err: fmt.Errorf("json: unknown field \"X\""), + in: `{"X": 1,"Y":2}`, + ptr: new(S5), + err: fmt.Errorf("json: unknown field \"X\""), disallowUnknownFields: true, }, { @@ -626,9 +626,9 @@ var unmarshalTests = []unmarshalTest{ out: S10{S13: S13{S8: S8{S9: S9{Y: 2}}}}, }, { - in: `{"X": 1,"Y":2}`, - ptr: new(S10), - err: fmt.Errorf("json: unknown field \"X\""), + in: `{"X": 1,"Y":2}`, + ptr: new(S10), + err: fmt.Errorf("json: unknown field \"X\""), disallowUnknownFields: true, }, @@ -835,8 +835,8 @@ var unmarshalTests = []unmarshalTest{ "Q": 18, "extra": true }`, - ptr: new(Top), - err: fmt.Errorf("json: unknown field \"extra\""), + ptr: new(Top), + err: fmt.Errorf("json: unknown field \"extra\""), disallowUnknownFields: true, }, { @@ -862,8 +862,8 @@ var unmarshalTests = []unmarshalTest{ "Z": 17, "Q": 18 }`, - ptr: new(Top), - err: fmt.Errorf("json: unknown field \"extra\""), + ptr: new(Top), + err: fmt.Errorf("json: unknown field \"extra\""), disallowUnknownFields: true, }, } diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index 9d667b6107287..b927fefd1ab86 100644 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go @@ -229,49 +229,49 @@ var pkgDeps = map[string][]string{ "go/types": {"L4", "GOPARSER", "container/heap", "go/constant"}, // One of a kind. - "archive/tar": {"L4", "OS", "syscall", "os/user"}, - "archive/zip": {"L4", "OS", "compress/flate"}, - "container/heap": {"sort"}, - "compress/bzip2": {"L4"}, - "compress/flate": {"L4"}, - "compress/gzip": {"L4", "compress/flate"}, - "compress/lzw": {"L4"}, - "compress/zlib": {"L4", "compress/flate"}, - "context": {"errors", "fmt", "reflect", "sync", "time"}, - "database/sql": {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"}, - "database/sql/driver": {"L4", "context", "time", "database/sql/internal"}, - "debug/dwarf": {"L4"}, - "debug/elf": {"L4", "OS", "debug/dwarf", "compress/zlib"}, - "debug/gosym": {"L4"}, - "debug/macho": {"L4", "OS", "debug/dwarf"}, - "debug/pe": {"L4", "OS", "debug/dwarf"}, - "debug/plan9obj": {"L4", "OS"}, - "encoding": {"L4"}, - "encoding/ascii85": {"L4"}, - "encoding/asn1": {"L4", "math/big"}, - "encoding/csv": {"L4"}, - "encoding/gob": {"L4", "OS", "encoding"}, - "encoding/hex": {"L4"}, - "encoding/json": {"L4", "encoding"}, - "encoding/pem": {"L4"}, - "encoding/xml": {"L4", "encoding"}, - "flag": {"L4", "OS"}, - "go/build": {"L4", "OS", "GOPARSER"}, - "html": {"L4"}, - "image/draw": {"L4", "image/internal/imageutil"}, - "image/gif": {"L4", "compress/lzw", "image/color/palette", "image/draw"}, - "image/internal/imageutil": {"L4"}, - "image/jpeg": {"L4", "image/internal/imageutil"}, - "image/png": {"L4", "compress/zlib"}, - "index/suffixarray": {"L4", "regexp"}, - "internal/singleflight": {"sync"}, - "internal/trace": {"L4", "OS"}, - "math/big": {"L4"}, - "mime": {"L4", "OS", "syscall", "internal/syscall/windows/registry"}, - "mime/quotedprintable": {"L4"}, - "net/internal/socktest": {"L4", "OS", "syscall", "internal/syscall/windows"}, - "net/url": {"L4"}, - "plugin": {"L0", "OS", "CGO"}, + "archive/tar": {"L4", "OS", "syscall", "os/user"}, + "archive/zip": {"L4", "OS", "compress/flate"}, + "container/heap": {"sort"}, + "compress/bzip2": {"L4"}, + "compress/flate": {"L4"}, + "compress/gzip": {"L4", "compress/flate"}, + "compress/lzw": {"L4"}, + "compress/zlib": {"L4", "compress/flate"}, + "context": {"errors", "fmt", "reflect", "sync", "time"}, + "database/sql": {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"}, + "database/sql/driver": {"L4", "context", "time", "database/sql/internal"}, + "debug/dwarf": {"L4"}, + "debug/elf": {"L4", "OS", "debug/dwarf", "compress/zlib"}, + "debug/gosym": {"L4"}, + "debug/macho": {"L4", "OS", "debug/dwarf"}, + "debug/pe": {"L4", "OS", "debug/dwarf"}, + "debug/plan9obj": {"L4", "OS"}, + "encoding": {"L4"}, + "encoding/ascii85": {"L4"}, + "encoding/asn1": {"L4", "math/big"}, + "encoding/csv": {"L4"}, + "encoding/gob": {"L4", "OS", "encoding"}, + "encoding/hex": {"L4"}, + "encoding/json": {"L4", "encoding"}, + "encoding/pem": {"L4"}, + "encoding/xml": {"L4", "encoding"}, + "flag": {"L4", "OS"}, + "go/build": {"L4", "OS", "GOPARSER"}, + "html": {"L4"}, + "image/draw": {"L4", "image/internal/imageutil"}, + "image/gif": {"L4", "compress/lzw", "image/color/palette", "image/draw"}, + "image/internal/imageutil": {"L4"}, + "image/jpeg": {"L4", "image/internal/imageutil"}, + "image/png": {"L4", "compress/zlib"}, + "index/suffixarray": {"L4", "regexp"}, + "internal/singleflight": {"sync"}, + "internal/trace": {"L4", "OS"}, + "math/big": {"L4"}, + "mime": {"L4", "OS", "syscall", "internal/syscall/windows/registry"}, + "mime/quotedprintable": {"L4"}, + "net/internal/socktest": {"L4", "OS", "syscall", "internal/syscall/windows"}, + "net/url": {"L4"}, + "plugin": {"L0", "OS", "CGO"}, "runtime/pprof/internal/profile": {"L4", "OS", "compress/gzip", "regexp"}, "testing/internal/testdeps": {"L4", "internal/testlog", "runtime/pprof", "regexp"}, "text/scanner": {"L4", "OS"}, diff --git a/src/go/types/object_test.go b/src/go/types/object_test.go index 88cd87574165b..9f0739441825f 100644 --- a/src/go/types/object_test.go +++ b/src/go/types/object_test.go @@ -29,9 +29,9 @@ func TestIsAlias(t *testing.T) { name *TypeName alias bool }{ - {NewTypeName(0, nil, "t0", nil), false}, // no type yet - {NewTypeName(0, pkg, "t0", nil), false}, // no type yet - {t1, false}, // type name refers to named type and vice versa + {NewTypeName(0, nil, "t0", nil), false}, // no type yet + {NewTypeName(0, pkg, "t0", nil), false}, // no type yet + {t1, false}, // type name refers to named type and vice versa {NewTypeName(0, nil, "t2", &emptyInterface), true}, // type name refers to unnamed type {NewTypeName(0, pkg, "t3", n1), true}, // type name refers to named type with different type name {NewTypeName(0, nil, "t4", Typ[Int32]), true}, // type name refers to basic type with different name diff --git a/src/html/entity.go b/src/html/entity.go index d123794335c6c..dfeaf6cabc70a 100644 --- a/src/html/entity.go +++ b/src/html/entity.go @@ -75,2083 +75,2083 @@ var entity = map[string]rune{ "Copf;": '\U00002102', "Coproduct;": '\U00002210', "CounterClockwiseContourIntegral;": '\U00002233', - "Cross;": '\U00002A2F', - "Cscr;": '\U0001D49E', - "Cup;": '\U000022D3', - "CupCap;": '\U0000224D', - "DD;": '\U00002145', - "DDotrahd;": '\U00002911', - "DJcy;": '\U00000402', - "DScy;": '\U00000405', - "DZcy;": '\U0000040F', - "Dagger;": '\U00002021', - "Darr;": '\U000021A1', - "Dashv;": '\U00002AE4', - "Dcaron;": '\U0000010E', - "Dcy;": '\U00000414', - "Del;": '\U00002207', - "Delta;": '\U00000394', - "Dfr;": '\U0001D507', - "DiacriticalAcute;": '\U000000B4', - "DiacriticalDot;": '\U000002D9', - "DiacriticalDoubleAcute;": '\U000002DD', - "DiacriticalGrave;": '\U00000060', - "DiacriticalTilde;": '\U000002DC', - "Diamond;": '\U000022C4', - "DifferentialD;": '\U00002146', - "Dopf;": '\U0001D53B', - "Dot;": '\U000000A8', - "DotDot;": '\U000020DC', - "DotEqual;": '\U00002250', - "DoubleContourIntegral;": '\U0000222F', - "DoubleDot;": '\U000000A8', - "DoubleDownArrow;": '\U000021D3', - "DoubleLeftArrow;": '\U000021D0', - "DoubleLeftRightArrow;": '\U000021D4', - "DoubleLeftTee;": '\U00002AE4', - "DoubleLongLeftArrow;": '\U000027F8', - "DoubleLongLeftRightArrow;": '\U000027FA', - "DoubleLongRightArrow;": '\U000027F9', - "DoubleRightArrow;": '\U000021D2', - "DoubleRightTee;": '\U000022A8', - "DoubleUpArrow;": '\U000021D1', - "DoubleUpDownArrow;": '\U000021D5', - "DoubleVerticalBar;": '\U00002225', - "DownArrow;": '\U00002193', - "DownArrowBar;": '\U00002913', - "DownArrowUpArrow;": '\U000021F5', - "DownBreve;": '\U00000311', - "DownLeftRightVector;": '\U00002950', - "DownLeftTeeVector;": '\U0000295E', - "DownLeftVector;": '\U000021BD', - "DownLeftVectorBar;": '\U00002956', - "DownRightTeeVector;": '\U0000295F', - "DownRightVector;": '\U000021C1', - "DownRightVectorBar;": '\U00002957', - "DownTee;": '\U000022A4', - "DownTeeArrow;": '\U000021A7', - "Downarrow;": '\U000021D3', - "Dscr;": '\U0001D49F', - "Dstrok;": '\U00000110', - "ENG;": '\U0000014A', - "ETH;": '\U000000D0', - "Eacute;": '\U000000C9', - "Ecaron;": '\U0000011A', - "Ecirc;": '\U000000CA', - "Ecy;": '\U0000042D', - "Edot;": '\U00000116', - "Efr;": '\U0001D508', - "Egrave;": '\U000000C8', - "Element;": '\U00002208', - "Emacr;": '\U00000112', - "EmptySmallSquare;": '\U000025FB', - "EmptyVerySmallSquare;": '\U000025AB', - "Eogon;": '\U00000118', - "Eopf;": '\U0001D53C', - "Epsilon;": '\U00000395', - "Equal;": '\U00002A75', - "EqualTilde;": '\U00002242', - "Equilibrium;": '\U000021CC', - "Escr;": '\U00002130', - "Esim;": '\U00002A73', - "Eta;": '\U00000397', - "Euml;": '\U000000CB', - "Exists;": '\U00002203', - "ExponentialE;": '\U00002147', - "Fcy;": '\U00000424', - "Ffr;": '\U0001D509', - "FilledSmallSquare;": '\U000025FC', - "FilledVerySmallSquare;": '\U000025AA', - "Fopf;": '\U0001D53D', - "ForAll;": '\U00002200', - "Fouriertrf;": '\U00002131', - "Fscr;": '\U00002131', - "GJcy;": '\U00000403', - "GT;": '\U0000003E', - "Gamma;": '\U00000393', - "Gammad;": '\U000003DC', - "Gbreve;": '\U0000011E', - "Gcedil;": '\U00000122', - "Gcirc;": '\U0000011C', - "Gcy;": '\U00000413', - "Gdot;": '\U00000120', - "Gfr;": '\U0001D50A', - "Gg;": '\U000022D9', - "Gopf;": '\U0001D53E', - "GreaterEqual;": '\U00002265', - "GreaterEqualLess;": '\U000022DB', - "GreaterFullEqual;": '\U00002267', - "GreaterGreater;": '\U00002AA2', - "GreaterLess;": '\U00002277', - "GreaterSlantEqual;": '\U00002A7E', - "GreaterTilde;": '\U00002273', - "Gscr;": '\U0001D4A2', - "Gt;": '\U0000226B', - "HARDcy;": '\U0000042A', - "Hacek;": '\U000002C7', - "Hat;": '\U0000005E', - "Hcirc;": '\U00000124', - "Hfr;": '\U0000210C', - "HilbertSpace;": '\U0000210B', - "Hopf;": '\U0000210D', - "HorizontalLine;": '\U00002500', - "Hscr;": '\U0000210B', - "Hstrok;": '\U00000126', - "HumpDownHump;": '\U0000224E', - "HumpEqual;": '\U0000224F', - "IEcy;": '\U00000415', - "IJlig;": '\U00000132', - "IOcy;": '\U00000401', - "Iacute;": '\U000000CD', - "Icirc;": '\U000000CE', - "Icy;": '\U00000418', - "Idot;": '\U00000130', - "Ifr;": '\U00002111', - "Igrave;": '\U000000CC', - "Im;": '\U00002111', - "Imacr;": '\U0000012A', - "ImaginaryI;": '\U00002148', - "Implies;": '\U000021D2', - "Int;": '\U0000222C', - "Integral;": '\U0000222B', - "Intersection;": '\U000022C2', - "InvisibleComma;": '\U00002063', - "InvisibleTimes;": '\U00002062', - "Iogon;": '\U0000012E', - "Iopf;": '\U0001D540', - "Iota;": '\U00000399', - "Iscr;": '\U00002110', - "Itilde;": '\U00000128', - "Iukcy;": '\U00000406', - "Iuml;": '\U000000CF', - "Jcirc;": '\U00000134', - "Jcy;": '\U00000419', - "Jfr;": '\U0001D50D', - "Jopf;": '\U0001D541', - "Jscr;": '\U0001D4A5', - "Jsercy;": '\U00000408', - "Jukcy;": '\U00000404', - "KHcy;": '\U00000425', - "KJcy;": '\U0000040C', - "Kappa;": '\U0000039A', - "Kcedil;": '\U00000136', - "Kcy;": '\U0000041A', - "Kfr;": '\U0001D50E', - "Kopf;": '\U0001D542', - "Kscr;": '\U0001D4A6', - "LJcy;": '\U00000409', - "LT;": '\U0000003C', - "Lacute;": '\U00000139', - "Lambda;": '\U0000039B', - "Lang;": '\U000027EA', - "Laplacetrf;": '\U00002112', - "Larr;": '\U0000219E', - "Lcaron;": '\U0000013D', - "Lcedil;": '\U0000013B', - "Lcy;": '\U0000041B', - "LeftAngleBracket;": '\U000027E8', - "LeftArrow;": '\U00002190', - "LeftArrowBar;": '\U000021E4', - "LeftArrowRightArrow;": '\U000021C6', - "LeftCeiling;": '\U00002308', - "LeftDoubleBracket;": '\U000027E6', - "LeftDownTeeVector;": '\U00002961', - "LeftDownVector;": '\U000021C3', - "LeftDownVectorBar;": '\U00002959', - "LeftFloor;": '\U0000230A', - "LeftRightArrow;": '\U00002194', - "LeftRightVector;": '\U0000294E', - "LeftTee;": '\U000022A3', - "LeftTeeArrow;": '\U000021A4', - "LeftTeeVector;": '\U0000295A', - "LeftTriangle;": '\U000022B2', - "LeftTriangleBar;": '\U000029CF', - "LeftTriangleEqual;": '\U000022B4', - "LeftUpDownVector;": '\U00002951', - "LeftUpTeeVector;": '\U00002960', - "LeftUpVector;": '\U000021BF', - "LeftUpVectorBar;": '\U00002958', - "LeftVector;": '\U000021BC', - "LeftVectorBar;": '\U00002952', - "Leftarrow;": '\U000021D0', - "Leftrightarrow;": '\U000021D4', - "LessEqualGreater;": '\U000022DA', - "LessFullEqual;": '\U00002266', - "LessGreater;": '\U00002276', - "LessLess;": '\U00002AA1', - "LessSlantEqual;": '\U00002A7D', - "LessTilde;": '\U00002272', - "Lfr;": '\U0001D50F', - "Ll;": '\U000022D8', - "Lleftarrow;": '\U000021DA', - "Lmidot;": '\U0000013F', - "LongLeftArrow;": '\U000027F5', - "LongLeftRightArrow;": '\U000027F7', - "LongRightArrow;": '\U000027F6', - "Longleftarrow;": '\U000027F8', - "Longleftrightarrow;": '\U000027FA', - "Longrightarrow;": '\U000027F9', - "Lopf;": '\U0001D543', - "LowerLeftArrow;": '\U00002199', - "LowerRightArrow;": '\U00002198', - "Lscr;": '\U00002112', - "Lsh;": '\U000021B0', - "Lstrok;": '\U00000141', - "Lt;": '\U0000226A', - "Map;": '\U00002905', - "Mcy;": '\U0000041C', - "MediumSpace;": '\U0000205F', - "Mellintrf;": '\U00002133', - "Mfr;": '\U0001D510', - "MinusPlus;": '\U00002213', - "Mopf;": '\U0001D544', - "Mscr;": '\U00002133', - "Mu;": '\U0000039C', - "NJcy;": '\U0000040A', - "Nacute;": '\U00000143', - "Ncaron;": '\U00000147', - "Ncedil;": '\U00000145', - "Ncy;": '\U0000041D', - "NegativeMediumSpace;": '\U0000200B', - "NegativeThickSpace;": '\U0000200B', - "NegativeThinSpace;": '\U0000200B', - "NegativeVeryThinSpace;": '\U0000200B', - "NestedGreaterGreater;": '\U0000226B', - "NestedLessLess;": '\U0000226A', - "NewLine;": '\U0000000A', - "Nfr;": '\U0001D511', - "NoBreak;": '\U00002060', - "NonBreakingSpace;": '\U000000A0', - "Nopf;": '\U00002115', - "Not;": '\U00002AEC', - "NotCongruent;": '\U00002262', - "NotCupCap;": '\U0000226D', - "NotDoubleVerticalBar;": '\U00002226', - "NotElement;": '\U00002209', - "NotEqual;": '\U00002260', - "NotExists;": '\U00002204', - "NotGreater;": '\U0000226F', - "NotGreaterEqual;": '\U00002271', - "NotGreaterLess;": '\U00002279', - "NotGreaterTilde;": '\U00002275', - "NotLeftTriangle;": '\U000022EA', - "NotLeftTriangleEqual;": '\U000022EC', - "NotLess;": '\U0000226E', - "NotLessEqual;": '\U00002270', - "NotLessGreater;": '\U00002278', - "NotLessTilde;": '\U00002274', - "NotPrecedes;": '\U00002280', - "NotPrecedesSlantEqual;": '\U000022E0', - "NotReverseElement;": '\U0000220C', - "NotRightTriangle;": '\U000022EB', - "NotRightTriangleEqual;": '\U000022ED', - "NotSquareSubsetEqual;": '\U000022E2', - "NotSquareSupersetEqual;": '\U000022E3', - "NotSubsetEqual;": '\U00002288', - "NotSucceeds;": '\U00002281', - "NotSucceedsSlantEqual;": '\U000022E1', - "NotSupersetEqual;": '\U00002289', - "NotTilde;": '\U00002241', - "NotTildeEqual;": '\U00002244', - "NotTildeFullEqual;": '\U00002247', - "NotTildeTilde;": '\U00002249', - "NotVerticalBar;": '\U00002224', - "Nscr;": '\U0001D4A9', - "Ntilde;": '\U000000D1', - "Nu;": '\U0000039D', - "OElig;": '\U00000152', - "Oacute;": '\U000000D3', - "Ocirc;": '\U000000D4', - "Ocy;": '\U0000041E', - "Odblac;": '\U00000150', - "Ofr;": '\U0001D512', - "Ograve;": '\U000000D2', - "Omacr;": '\U0000014C', - "Omega;": '\U000003A9', - "Omicron;": '\U0000039F', - "Oopf;": '\U0001D546', - "OpenCurlyDoubleQuote;": '\U0000201C', - "OpenCurlyQuote;": '\U00002018', - "Or;": '\U00002A54', - "Oscr;": '\U0001D4AA', - "Oslash;": '\U000000D8', - "Otilde;": '\U000000D5', - "Otimes;": '\U00002A37', - "Ouml;": '\U000000D6', - "OverBar;": '\U0000203E', - "OverBrace;": '\U000023DE', - "OverBracket;": '\U000023B4', - "OverParenthesis;": '\U000023DC', - "PartialD;": '\U00002202', - "Pcy;": '\U0000041F', - "Pfr;": '\U0001D513', - "Phi;": '\U000003A6', - "Pi;": '\U000003A0', - "PlusMinus;": '\U000000B1', - "Poincareplane;": '\U0000210C', - "Popf;": '\U00002119', - "Pr;": '\U00002ABB', - "Precedes;": '\U0000227A', - "PrecedesEqual;": '\U00002AAF', - "PrecedesSlantEqual;": '\U0000227C', - "PrecedesTilde;": '\U0000227E', - "Prime;": '\U00002033', - "Product;": '\U0000220F', - "Proportion;": '\U00002237', - "Proportional;": '\U0000221D', - "Pscr;": '\U0001D4AB', - "Psi;": '\U000003A8', - "QUOT;": '\U00000022', - "Qfr;": '\U0001D514', - "Qopf;": '\U0000211A', - "Qscr;": '\U0001D4AC', - "RBarr;": '\U00002910', - "REG;": '\U000000AE', - "Racute;": '\U00000154', - "Rang;": '\U000027EB', - "Rarr;": '\U000021A0', - "Rarrtl;": '\U00002916', - "Rcaron;": '\U00000158', - "Rcedil;": '\U00000156', - "Rcy;": '\U00000420', - "Re;": '\U0000211C', - "ReverseElement;": '\U0000220B', - "ReverseEquilibrium;": '\U000021CB', - "ReverseUpEquilibrium;": '\U0000296F', - "Rfr;": '\U0000211C', - "Rho;": '\U000003A1', - "RightAngleBracket;": '\U000027E9', - "RightArrow;": '\U00002192', - "RightArrowBar;": '\U000021E5', - "RightArrowLeftArrow;": '\U000021C4', - "RightCeiling;": '\U00002309', - "RightDoubleBracket;": '\U000027E7', - "RightDownTeeVector;": '\U0000295D', - "RightDownVector;": '\U000021C2', - "RightDownVectorBar;": '\U00002955', - "RightFloor;": '\U0000230B', - "RightTee;": '\U000022A2', - "RightTeeArrow;": '\U000021A6', - "RightTeeVector;": '\U0000295B', - "RightTriangle;": '\U000022B3', - "RightTriangleBar;": '\U000029D0', - "RightTriangleEqual;": '\U000022B5', - "RightUpDownVector;": '\U0000294F', - "RightUpTeeVector;": '\U0000295C', - "RightUpVector;": '\U000021BE', - "RightUpVectorBar;": '\U00002954', - "RightVector;": '\U000021C0', - "RightVectorBar;": '\U00002953', - "Rightarrow;": '\U000021D2', - "Ropf;": '\U0000211D', - "RoundImplies;": '\U00002970', - "Rrightarrow;": '\U000021DB', - "Rscr;": '\U0000211B', - "Rsh;": '\U000021B1', - "RuleDelayed;": '\U000029F4', - "SHCHcy;": '\U00000429', - "SHcy;": '\U00000428', - "SOFTcy;": '\U0000042C', - "Sacute;": '\U0000015A', - "Sc;": '\U00002ABC', - "Scaron;": '\U00000160', - "Scedil;": '\U0000015E', - "Scirc;": '\U0000015C', - "Scy;": '\U00000421', - "Sfr;": '\U0001D516', - "ShortDownArrow;": '\U00002193', - "ShortLeftArrow;": '\U00002190', - "ShortRightArrow;": '\U00002192', - "ShortUpArrow;": '\U00002191', - "Sigma;": '\U000003A3', - "SmallCircle;": '\U00002218', - "Sopf;": '\U0001D54A', - "Sqrt;": '\U0000221A', - "Square;": '\U000025A1', - "SquareIntersection;": '\U00002293', - "SquareSubset;": '\U0000228F', - "SquareSubsetEqual;": '\U00002291', - "SquareSuperset;": '\U00002290', - "SquareSupersetEqual;": '\U00002292', - "SquareUnion;": '\U00002294', - "Sscr;": '\U0001D4AE', - "Star;": '\U000022C6', - "Sub;": '\U000022D0', - "Subset;": '\U000022D0', - "SubsetEqual;": '\U00002286', - "Succeeds;": '\U0000227B', - "SucceedsEqual;": '\U00002AB0', - "SucceedsSlantEqual;": '\U0000227D', - "SucceedsTilde;": '\U0000227F', - "SuchThat;": '\U0000220B', - "Sum;": '\U00002211', - "Sup;": '\U000022D1', - "Superset;": '\U00002283', - "SupersetEqual;": '\U00002287', - "Supset;": '\U000022D1', - "THORN;": '\U000000DE', - "TRADE;": '\U00002122', - "TSHcy;": '\U0000040B', - "TScy;": '\U00000426', - "Tab;": '\U00000009', - "Tau;": '\U000003A4', - "Tcaron;": '\U00000164', - "Tcedil;": '\U00000162', - "Tcy;": '\U00000422', - "Tfr;": '\U0001D517', - "Therefore;": '\U00002234', - "Theta;": '\U00000398', - "ThinSpace;": '\U00002009', - "Tilde;": '\U0000223C', - "TildeEqual;": '\U00002243', - "TildeFullEqual;": '\U00002245', - "TildeTilde;": '\U00002248', - "Topf;": '\U0001D54B', - "TripleDot;": '\U000020DB', - "Tscr;": '\U0001D4AF', - "Tstrok;": '\U00000166', - "Uacute;": '\U000000DA', - "Uarr;": '\U0000219F', - "Uarrocir;": '\U00002949', - "Ubrcy;": '\U0000040E', - "Ubreve;": '\U0000016C', - "Ucirc;": '\U000000DB', - "Ucy;": '\U00000423', - "Udblac;": '\U00000170', - "Ufr;": '\U0001D518', - "Ugrave;": '\U000000D9', - "Umacr;": '\U0000016A', - "UnderBar;": '\U0000005F', - "UnderBrace;": '\U000023DF', - "UnderBracket;": '\U000023B5', - "UnderParenthesis;": '\U000023DD', - "Union;": '\U000022C3', - "UnionPlus;": '\U0000228E', - "Uogon;": '\U00000172', - "Uopf;": '\U0001D54C', - "UpArrow;": '\U00002191', - "UpArrowBar;": '\U00002912', - "UpArrowDownArrow;": '\U000021C5', - "UpDownArrow;": '\U00002195', - "UpEquilibrium;": '\U0000296E', - "UpTee;": '\U000022A5', - "UpTeeArrow;": '\U000021A5', - "Uparrow;": '\U000021D1', - "Updownarrow;": '\U000021D5', - "UpperLeftArrow;": '\U00002196', - "UpperRightArrow;": '\U00002197', - "Upsi;": '\U000003D2', - "Upsilon;": '\U000003A5', - "Uring;": '\U0000016E', - "Uscr;": '\U0001D4B0', - "Utilde;": '\U00000168', - "Uuml;": '\U000000DC', - "VDash;": '\U000022AB', - "Vbar;": '\U00002AEB', - "Vcy;": '\U00000412', - "Vdash;": '\U000022A9', - "Vdashl;": '\U00002AE6', - "Vee;": '\U000022C1', - "Verbar;": '\U00002016', - "Vert;": '\U00002016', - "VerticalBar;": '\U00002223', - "VerticalLine;": '\U0000007C', - "VerticalSeparator;": '\U00002758', - "VerticalTilde;": '\U00002240', - "VeryThinSpace;": '\U0000200A', - "Vfr;": '\U0001D519', - "Vopf;": '\U0001D54D', - "Vscr;": '\U0001D4B1', - "Vvdash;": '\U000022AA', - "Wcirc;": '\U00000174', - "Wedge;": '\U000022C0', - "Wfr;": '\U0001D51A', - "Wopf;": '\U0001D54E', - "Wscr;": '\U0001D4B2', - "Xfr;": '\U0001D51B', - "Xi;": '\U0000039E', - "Xopf;": '\U0001D54F', - "Xscr;": '\U0001D4B3', - "YAcy;": '\U0000042F', - "YIcy;": '\U00000407', - "YUcy;": '\U0000042E', - "Yacute;": '\U000000DD', - "Ycirc;": '\U00000176', - "Ycy;": '\U0000042B', - "Yfr;": '\U0001D51C', - "Yopf;": '\U0001D550', - "Yscr;": '\U0001D4B4', - "Yuml;": '\U00000178', - "ZHcy;": '\U00000416', - "Zacute;": '\U00000179', - "Zcaron;": '\U0000017D', - "Zcy;": '\U00000417', - "Zdot;": '\U0000017B', - "ZeroWidthSpace;": '\U0000200B', - "Zeta;": '\U00000396', - "Zfr;": '\U00002128', - "Zopf;": '\U00002124', - "Zscr;": '\U0001D4B5', - "aacute;": '\U000000E1', - "abreve;": '\U00000103', - "ac;": '\U0000223E', - "acd;": '\U0000223F', - "acirc;": '\U000000E2', - "acute;": '\U000000B4', - "acy;": '\U00000430', - "aelig;": '\U000000E6', - "af;": '\U00002061', - "afr;": '\U0001D51E', - "agrave;": '\U000000E0', - "alefsym;": '\U00002135', - "aleph;": '\U00002135', - "alpha;": '\U000003B1', - "amacr;": '\U00000101', - "amalg;": '\U00002A3F', - "amp;": '\U00000026', - "and;": '\U00002227', - "andand;": '\U00002A55', - "andd;": '\U00002A5C', - "andslope;": '\U00002A58', - "andv;": '\U00002A5A', - "ang;": '\U00002220', - "ange;": '\U000029A4', - "angle;": '\U00002220', - "angmsd;": '\U00002221', - "angmsdaa;": '\U000029A8', - "angmsdab;": '\U000029A9', - "angmsdac;": '\U000029AA', - "angmsdad;": '\U000029AB', - "angmsdae;": '\U000029AC', - "angmsdaf;": '\U000029AD', - "angmsdag;": '\U000029AE', - "angmsdah;": '\U000029AF', - "angrt;": '\U0000221F', - "angrtvb;": '\U000022BE', - "angrtvbd;": '\U0000299D', - "angsph;": '\U00002222', - "angst;": '\U000000C5', - "angzarr;": '\U0000237C', - "aogon;": '\U00000105', - "aopf;": '\U0001D552', - "ap;": '\U00002248', - "apE;": '\U00002A70', - "apacir;": '\U00002A6F', - "ape;": '\U0000224A', - "apid;": '\U0000224B', - "apos;": '\U00000027', - "approx;": '\U00002248', - "approxeq;": '\U0000224A', - "aring;": '\U000000E5', - "ascr;": '\U0001D4B6', - "ast;": '\U0000002A', - "asymp;": '\U00002248', - "asympeq;": '\U0000224D', - "atilde;": '\U000000E3', - "auml;": '\U000000E4', - "awconint;": '\U00002233', - "awint;": '\U00002A11', - "bNot;": '\U00002AED', - "backcong;": '\U0000224C', - "backepsilon;": '\U000003F6', - "backprime;": '\U00002035', - "backsim;": '\U0000223D', - "backsimeq;": '\U000022CD', - "barvee;": '\U000022BD', - "barwed;": '\U00002305', - "barwedge;": '\U00002305', - "bbrk;": '\U000023B5', - "bbrktbrk;": '\U000023B6', - "bcong;": '\U0000224C', - "bcy;": '\U00000431', - "bdquo;": '\U0000201E', - "becaus;": '\U00002235', - "because;": '\U00002235', - "bemptyv;": '\U000029B0', - "bepsi;": '\U000003F6', - "bernou;": '\U0000212C', - "beta;": '\U000003B2', - "beth;": '\U00002136', - "between;": '\U0000226C', - "bfr;": '\U0001D51F', - "bigcap;": '\U000022C2', - "bigcirc;": '\U000025EF', - "bigcup;": '\U000022C3', - "bigodot;": '\U00002A00', - "bigoplus;": '\U00002A01', - "bigotimes;": '\U00002A02', - "bigsqcup;": '\U00002A06', - "bigstar;": '\U00002605', - "bigtriangledown;": '\U000025BD', - "bigtriangleup;": '\U000025B3', - "biguplus;": '\U00002A04', - "bigvee;": '\U000022C1', - "bigwedge;": '\U000022C0', - "bkarow;": '\U0000290D', - "blacklozenge;": '\U000029EB', - "blacksquare;": '\U000025AA', - "blacktriangle;": '\U000025B4', - "blacktriangledown;": '\U000025BE', - "blacktriangleleft;": '\U000025C2', - "blacktriangleright;": '\U000025B8', - "blank;": '\U00002423', - "blk12;": '\U00002592', - "blk14;": '\U00002591', - "blk34;": '\U00002593', - "block;": '\U00002588', - "bnot;": '\U00002310', - "bopf;": '\U0001D553', - "bot;": '\U000022A5', - "bottom;": '\U000022A5', - "bowtie;": '\U000022C8', - "boxDL;": '\U00002557', - "boxDR;": '\U00002554', - "boxDl;": '\U00002556', - "boxDr;": '\U00002553', - "boxH;": '\U00002550', - "boxHD;": '\U00002566', - "boxHU;": '\U00002569', - "boxHd;": '\U00002564', - "boxHu;": '\U00002567', - "boxUL;": '\U0000255D', - "boxUR;": '\U0000255A', - "boxUl;": '\U0000255C', - "boxUr;": '\U00002559', - "boxV;": '\U00002551', - "boxVH;": '\U0000256C', - "boxVL;": '\U00002563', - "boxVR;": '\U00002560', - "boxVh;": '\U0000256B', - "boxVl;": '\U00002562', - "boxVr;": '\U0000255F', - "boxbox;": '\U000029C9', - "boxdL;": '\U00002555', - "boxdR;": '\U00002552', - "boxdl;": '\U00002510', - "boxdr;": '\U0000250C', - "boxh;": '\U00002500', - "boxhD;": '\U00002565', - "boxhU;": '\U00002568', - "boxhd;": '\U0000252C', - "boxhu;": '\U00002534', - "boxminus;": '\U0000229F', - "boxplus;": '\U0000229E', - "boxtimes;": '\U000022A0', - "boxuL;": '\U0000255B', - "boxuR;": '\U00002558', - "boxul;": '\U00002518', - "boxur;": '\U00002514', - "boxv;": '\U00002502', - "boxvH;": '\U0000256A', - "boxvL;": '\U00002561', - "boxvR;": '\U0000255E', - "boxvh;": '\U0000253C', - "boxvl;": '\U00002524', - "boxvr;": '\U0000251C', - "bprime;": '\U00002035', - "breve;": '\U000002D8', - "brvbar;": '\U000000A6', - "bscr;": '\U0001D4B7', - "bsemi;": '\U0000204F', - "bsim;": '\U0000223D', - "bsime;": '\U000022CD', - "bsol;": '\U0000005C', - "bsolb;": '\U000029C5', - "bsolhsub;": '\U000027C8', - "bull;": '\U00002022', - "bullet;": '\U00002022', - "bump;": '\U0000224E', - "bumpE;": '\U00002AAE', - "bumpe;": '\U0000224F', - "bumpeq;": '\U0000224F', - "cacute;": '\U00000107', - "cap;": '\U00002229', - "capand;": '\U00002A44', - "capbrcup;": '\U00002A49', - "capcap;": '\U00002A4B', - "capcup;": '\U00002A47', - "capdot;": '\U00002A40', - "caret;": '\U00002041', - "caron;": '\U000002C7', - "ccaps;": '\U00002A4D', - "ccaron;": '\U0000010D', - "ccedil;": '\U000000E7', - "ccirc;": '\U00000109', - "ccups;": '\U00002A4C', - "ccupssm;": '\U00002A50', - "cdot;": '\U0000010B', - "cedil;": '\U000000B8', - "cemptyv;": '\U000029B2', - "cent;": '\U000000A2', - "centerdot;": '\U000000B7', - "cfr;": '\U0001D520', - "chcy;": '\U00000447', - "check;": '\U00002713', - "checkmark;": '\U00002713', - "chi;": '\U000003C7', - "cir;": '\U000025CB', - "cirE;": '\U000029C3', - "circ;": '\U000002C6', - "circeq;": '\U00002257', - "circlearrowleft;": '\U000021BA', - "circlearrowright;": '\U000021BB', - "circledR;": '\U000000AE', - "circledS;": '\U000024C8', - "circledast;": '\U0000229B', - "circledcirc;": '\U0000229A', - "circleddash;": '\U0000229D', - "cire;": '\U00002257', - "cirfnint;": '\U00002A10', - "cirmid;": '\U00002AEF', - "cirscir;": '\U000029C2', - "clubs;": '\U00002663', - "clubsuit;": '\U00002663', - "colon;": '\U0000003A', - "colone;": '\U00002254', - "coloneq;": '\U00002254', - "comma;": '\U0000002C', - "commat;": '\U00000040', - "comp;": '\U00002201', - "compfn;": '\U00002218', - "complement;": '\U00002201', - "complexes;": '\U00002102', - "cong;": '\U00002245', - "congdot;": '\U00002A6D', - "conint;": '\U0000222E', - "copf;": '\U0001D554', - "coprod;": '\U00002210', - "copy;": '\U000000A9', - "copysr;": '\U00002117', - "crarr;": '\U000021B5', - "cross;": '\U00002717', - "cscr;": '\U0001D4B8', - "csub;": '\U00002ACF', - "csube;": '\U00002AD1', - "csup;": '\U00002AD0', - "csupe;": '\U00002AD2', - "ctdot;": '\U000022EF', - "cudarrl;": '\U00002938', - "cudarrr;": '\U00002935', - "cuepr;": '\U000022DE', - "cuesc;": '\U000022DF', - "cularr;": '\U000021B6', - "cularrp;": '\U0000293D', - "cup;": '\U0000222A', - "cupbrcap;": '\U00002A48', - "cupcap;": '\U00002A46', - "cupcup;": '\U00002A4A', - "cupdot;": '\U0000228D', - "cupor;": '\U00002A45', - "curarr;": '\U000021B7', - "curarrm;": '\U0000293C', - "curlyeqprec;": '\U000022DE', - "curlyeqsucc;": '\U000022DF', - "curlyvee;": '\U000022CE', - "curlywedge;": '\U000022CF', - "curren;": '\U000000A4', - "curvearrowleft;": '\U000021B6', - "curvearrowright;": '\U000021B7', - "cuvee;": '\U000022CE', - "cuwed;": '\U000022CF', - "cwconint;": '\U00002232', - "cwint;": '\U00002231', - "cylcty;": '\U0000232D', - "dArr;": '\U000021D3', - "dHar;": '\U00002965', - "dagger;": '\U00002020', - "daleth;": '\U00002138', - "darr;": '\U00002193', - "dash;": '\U00002010', - "dashv;": '\U000022A3', - "dbkarow;": '\U0000290F', - "dblac;": '\U000002DD', - "dcaron;": '\U0000010F', - "dcy;": '\U00000434', - "dd;": '\U00002146', - "ddagger;": '\U00002021', - "ddarr;": '\U000021CA', - "ddotseq;": '\U00002A77', - "deg;": '\U000000B0', - "delta;": '\U000003B4', - "demptyv;": '\U000029B1', - "dfisht;": '\U0000297F', - "dfr;": '\U0001D521', - "dharl;": '\U000021C3', - "dharr;": '\U000021C2', - "diam;": '\U000022C4', - "diamond;": '\U000022C4', - "diamondsuit;": '\U00002666', - "diams;": '\U00002666', - "die;": '\U000000A8', - "digamma;": '\U000003DD', - "disin;": '\U000022F2', - "div;": '\U000000F7', - "divide;": '\U000000F7', - "divideontimes;": '\U000022C7', - "divonx;": '\U000022C7', - "djcy;": '\U00000452', - "dlcorn;": '\U0000231E', - "dlcrop;": '\U0000230D', - "dollar;": '\U00000024', - "dopf;": '\U0001D555', - "dot;": '\U000002D9', - "doteq;": '\U00002250', - "doteqdot;": '\U00002251', - "dotminus;": '\U00002238', - "dotplus;": '\U00002214', - "dotsquare;": '\U000022A1', - "doublebarwedge;": '\U00002306', - "downarrow;": '\U00002193', - "downdownarrows;": '\U000021CA', - "downharpoonleft;": '\U000021C3', - "downharpoonright;": '\U000021C2', - "drbkarow;": '\U00002910', - "drcorn;": '\U0000231F', - "drcrop;": '\U0000230C', - "dscr;": '\U0001D4B9', - "dscy;": '\U00000455', - "dsol;": '\U000029F6', - "dstrok;": '\U00000111', - "dtdot;": '\U000022F1', - "dtri;": '\U000025BF', - "dtrif;": '\U000025BE', - "duarr;": '\U000021F5', - "duhar;": '\U0000296F', - "dwangle;": '\U000029A6', - "dzcy;": '\U0000045F', - "dzigrarr;": '\U000027FF', - "eDDot;": '\U00002A77', - "eDot;": '\U00002251', - "eacute;": '\U000000E9', - "easter;": '\U00002A6E', - "ecaron;": '\U0000011B', - "ecir;": '\U00002256', - "ecirc;": '\U000000EA', - "ecolon;": '\U00002255', - "ecy;": '\U0000044D', - "edot;": '\U00000117', - "ee;": '\U00002147', - "efDot;": '\U00002252', - "efr;": '\U0001D522', - "eg;": '\U00002A9A', - "egrave;": '\U000000E8', - "egs;": '\U00002A96', - "egsdot;": '\U00002A98', - "el;": '\U00002A99', - "elinters;": '\U000023E7', - "ell;": '\U00002113', - "els;": '\U00002A95', - "elsdot;": '\U00002A97', - "emacr;": '\U00000113', - "empty;": '\U00002205', - "emptyset;": '\U00002205', - "emptyv;": '\U00002205', - "emsp;": '\U00002003', - "emsp13;": '\U00002004', - "emsp14;": '\U00002005', - "eng;": '\U0000014B', - "ensp;": '\U00002002', - "eogon;": '\U00000119', - "eopf;": '\U0001D556', - "epar;": '\U000022D5', - "eparsl;": '\U000029E3', - "eplus;": '\U00002A71', - "epsi;": '\U000003B5', - "epsilon;": '\U000003B5', - "epsiv;": '\U000003F5', - "eqcirc;": '\U00002256', - "eqcolon;": '\U00002255', - "eqsim;": '\U00002242', - "eqslantgtr;": '\U00002A96', - "eqslantless;": '\U00002A95', - "equals;": '\U0000003D', - "equest;": '\U0000225F', - "equiv;": '\U00002261', - "equivDD;": '\U00002A78', - "eqvparsl;": '\U000029E5', - "erDot;": '\U00002253', - "erarr;": '\U00002971', - "escr;": '\U0000212F', - "esdot;": '\U00002250', - "esim;": '\U00002242', - "eta;": '\U000003B7', - "eth;": '\U000000F0', - "euml;": '\U000000EB', - "euro;": '\U000020AC', - "excl;": '\U00000021', - "exist;": '\U00002203', - "expectation;": '\U00002130', - "exponentiale;": '\U00002147', - "fallingdotseq;": '\U00002252', - "fcy;": '\U00000444', - "female;": '\U00002640', - "ffilig;": '\U0000FB03', - "fflig;": '\U0000FB00', - "ffllig;": '\U0000FB04', - "ffr;": '\U0001D523', - "filig;": '\U0000FB01', - "flat;": '\U0000266D', - "fllig;": '\U0000FB02', - "fltns;": '\U000025B1', - "fnof;": '\U00000192', - "fopf;": '\U0001D557', - "forall;": '\U00002200', - "fork;": '\U000022D4', - "forkv;": '\U00002AD9', - "fpartint;": '\U00002A0D', - "frac12;": '\U000000BD', - "frac13;": '\U00002153', - "frac14;": '\U000000BC', - "frac15;": '\U00002155', - "frac16;": '\U00002159', - "frac18;": '\U0000215B', - "frac23;": '\U00002154', - "frac25;": '\U00002156', - "frac34;": '\U000000BE', - "frac35;": '\U00002157', - "frac38;": '\U0000215C', - "frac45;": '\U00002158', - "frac56;": '\U0000215A', - "frac58;": '\U0000215D', - "frac78;": '\U0000215E', - "frasl;": '\U00002044', - "frown;": '\U00002322', - "fscr;": '\U0001D4BB', - "gE;": '\U00002267', - "gEl;": '\U00002A8C', - "gacute;": '\U000001F5', - "gamma;": '\U000003B3', - "gammad;": '\U000003DD', - "gap;": '\U00002A86', - "gbreve;": '\U0000011F', - "gcirc;": '\U0000011D', - "gcy;": '\U00000433', - "gdot;": '\U00000121', - "ge;": '\U00002265', - "gel;": '\U000022DB', - "geq;": '\U00002265', - "geqq;": '\U00002267', - "geqslant;": '\U00002A7E', - "ges;": '\U00002A7E', - "gescc;": '\U00002AA9', - "gesdot;": '\U00002A80', - "gesdoto;": '\U00002A82', - "gesdotol;": '\U00002A84', - "gesles;": '\U00002A94', - "gfr;": '\U0001D524', - "gg;": '\U0000226B', - "ggg;": '\U000022D9', - "gimel;": '\U00002137', - "gjcy;": '\U00000453', - "gl;": '\U00002277', - "glE;": '\U00002A92', - "gla;": '\U00002AA5', - "glj;": '\U00002AA4', - "gnE;": '\U00002269', - "gnap;": '\U00002A8A', - "gnapprox;": '\U00002A8A', - "gne;": '\U00002A88', - "gneq;": '\U00002A88', - "gneqq;": '\U00002269', - "gnsim;": '\U000022E7', - "gopf;": '\U0001D558', - "grave;": '\U00000060', - "gscr;": '\U0000210A', - "gsim;": '\U00002273', - "gsime;": '\U00002A8E', - "gsiml;": '\U00002A90', - "gt;": '\U0000003E', - "gtcc;": '\U00002AA7', - "gtcir;": '\U00002A7A', - "gtdot;": '\U000022D7', - "gtlPar;": '\U00002995', - "gtquest;": '\U00002A7C', - "gtrapprox;": '\U00002A86', - "gtrarr;": '\U00002978', - "gtrdot;": '\U000022D7', - "gtreqless;": '\U000022DB', - "gtreqqless;": '\U00002A8C', - "gtrless;": '\U00002277', - "gtrsim;": '\U00002273', - "hArr;": '\U000021D4', - "hairsp;": '\U0000200A', - "half;": '\U000000BD', - "hamilt;": '\U0000210B', - "hardcy;": '\U0000044A', - "harr;": '\U00002194', - "harrcir;": '\U00002948', - "harrw;": '\U000021AD', - "hbar;": '\U0000210F', - "hcirc;": '\U00000125', - "hearts;": '\U00002665', - "heartsuit;": '\U00002665', - "hellip;": '\U00002026', - "hercon;": '\U000022B9', - "hfr;": '\U0001D525', - "hksearow;": '\U00002925', - "hkswarow;": '\U00002926', - "hoarr;": '\U000021FF', - "homtht;": '\U0000223B', - "hookleftarrow;": '\U000021A9', - "hookrightarrow;": '\U000021AA', - "hopf;": '\U0001D559', - "horbar;": '\U00002015', - "hscr;": '\U0001D4BD', - "hslash;": '\U0000210F', - "hstrok;": '\U00000127', - "hybull;": '\U00002043', - "hyphen;": '\U00002010', - "iacute;": '\U000000ED', - "ic;": '\U00002063', - "icirc;": '\U000000EE', - "icy;": '\U00000438', - "iecy;": '\U00000435', - "iexcl;": '\U000000A1', - "iff;": '\U000021D4', - "ifr;": '\U0001D526', - "igrave;": '\U000000EC', - "ii;": '\U00002148', - "iiiint;": '\U00002A0C', - "iiint;": '\U0000222D', - "iinfin;": '\U000029DC', - "iiota;": '\U00002129', - "ijlig;": '\U00000133', - "imacr;": '\U0000012B', - "image;": '\U00002111', - "imagline;": '\U00002110', - "imagpart;": '\U00002111', - "imath;": '\U00000131', - "imof;": '\U000022B7', - "imped;": '\U000001B5', - "in;": '\U00002208', - "incare;": '\U00002105', - "infin;": '\U0000221E', - "infintie;": '\U000029DD', - "inodot;": '\U00000131', - "int;": '\U0000222B', - "intcal;": '\U000022BA', - "integers;": '\U00002124', - "intercal;": '\U000022BA', - "intlarhk;": '\U00002A17', - "intprod;": '\U00002A3C', - "iocy;": '\U00000451', - "iogon;": '\U0000012F', - "iopf;": '\U0001D55A', - "iota;": '\U000003B9', - "iprod;": '\U00002A3C', - "iquest;": '\U000000BF', - "iscr;": '\U0001D4BE', - "isin;": '\U00002208', - "isinE;": '\U000022F9', - "isindot;": '\U000022F5', - "isins;": '\U000022F4', - "isinsv;": '\U000022F3', - "isinv;": '\U00002208', - "it;": '\U00002062', - "itilde;": '\U00000129', - "iukcy;": '\U00000456', - "iuml;": '\U000000EF', - "jcirc;": '\U00000135', - "jcy;": '\U00000439', - "jfr;": '\U0001D527', - "jmath;": '\U00000237', - "jopf;": '\U0001D55B', - "jscr;": '\U0001D4BF', - "jsercy;": '\U00000458', - "jukcy;": '\U00000454', - "kappa;": '\U000003BA', - "kappav;": '\U000003F0', - "kcedil;": '\U00000137', - "kcy;": '\U0000043A', - "kfr;": '\U0001D528', - "kgreen;": '\U00000138', - "khcy;": '\U00000445', - "kjcy;": '\U0000045C', - "kopf;": '\U0001D55C', - "kscr;": '\U0001D4C0', - "lAarr;": '\U000021DA', - "lArr;": '\U000021D0', - "lAtail;": '\U0000291B', - "lBarr;": '\U0000290E', - "lE;": '\U00002266', - "lEg;": '\U00002A8B', - "lHar;": '\U00002962', - "lacute;": '\U0000013A', - "laemptyv;": '\U000029B4', - "lagran;": '\U00002112', - "lambda;": '\U000003BB', - "lang;": '\U000027E8', - "langd;": '\U00002991', - "langle;": '\U000027E8', - "lap;": '\U00002A85', - "laquo;": '\U000000AB', - "larr;": '\U00002190', - "larrb;": '\U000021E4', - "larrbfs;": '\U0000291F', - "larrfs;": '\U0000291D', - "larrhk;": '\U000021A9', - "larrlp;": '\U000021AB', - "larrpl;": '\U00002939', - "larrsim;": '\U00002973', - "larrtl;": '\U000021A2', - "lat;": '\U00002AAB', - "latail;": '\U00002919', - "late;": '\U00002AAD', - "lbarr;": '\U0000290C', - "lbbrk;": '\U00002772', - "lbrace;": '\U0000007B', - "lbrack;": '\U0000005B', - "lbrke;": '\U0000298B', - "lbrksld;": '\U0000298F', - "lbrkslu;": '\U0000298D', - "lcaron;": '\U0000013E', - "lcedil;": '\U0000013C', - "lceil;": '\U00002308', - "lcub;": '\U0000007B', - "lcy;": '\U0000043B', - "ldca;": '\U00002936', - "ldquo;": '\U0000201C', - "ldquor;": '\U0000201E', - "ldrdhar;": '\U00002967', - "ldrushar;": '\U0000294B', - "ldsh;": '\U000021B2', - "le;": '\U00002264', - "leftarrow;": '\U00002190', - "leftarrowtail;": '\U000021A2', - "leftharpoondown;": '\U000021BD', - "leftharpoonup;": '\U000021BC', - "leftleftarrows;": '\U000021C7', - "leftrightarrow;": '\U00002194', - "leftrightarrows;": '\U000021C6', - "leftrightharpoons;": '\U000021CB', - "leftrightsquigarrow;": '\U000021AD', - "leftthreetimes;": '\U000022CB', - "leg;": '\U000022DA', - "leq;": '\U00002264', - "leqq;": '\U00002266', - "leqslant;": '\U00002A7D', - "les;": '\U00002A7D', - "lescc;": '\U00002AA8', - "lesdot;": '\U00002A7F', - "lesdoto;": '\U00002A81', - "lesdotor;": '\U00002A83', - "lesges;": '\U00002A93', - "lessapprox;": '\U00002A85', - "lessdot;": '\U000022D6', - "lesseqgtr;": '\U000022DA', - "lesseqqgtr;": '\U00002A8B', - "lessgtr;": '\U00002276', - "lesssim;": '\U00002272', - "lfisht;": '\U0000297C', - "lfloor;": '\U0000230A', - "lfr;": '\U0001D529', - "lg;": '\U00002276', - "lgE;": '\U00002A91', - "lhard;": '\U000021BD', - "lharu;": '\U000021BC', - "lharul;": '\U0000296A', - "lhblk;": '\U00002584', - "ljcy;": '\U00000459', - "ll;": '\U0000226A', - "llarr;": '\U000021C7', - "llcorner;": '\U0000231E', - "llhard;": '\U0000296B', - "lltri;": '\U000025FA', - "lmidot;": '\U00000140', - "lmoust;": '\U000023B0', - "lmoustache;": '\U000023B0', - "lnE;": '\U00002268', - "lnap;": '\U00002A89', - "lnapprox;": '\U00002A89', - "lne;": '\U00002A87', - "lneq;": '\U00002A87', - "lneqq;": '\U00002268', - "lnsim;": '\U000022E6', - "loang;": '\U000027EC', - "loarr;": '\U000021FD', - "lobrk;": '\U000027E6', - "longleftarrow;": '\U000027F5', - "longleftrightarrow;": '\U000027F7', - "longmapsto;": '\U000027FC', - "longrightarrow;": '\U000027F6', - "looparrowleft;": '\U000021AB', - "looparrowright;": '\U000021AC', - "lopar;": '\U00002985', - "lopf;": '\U0001D55D', - "loplus;": '\U00002A2D', - "lotimes;": '\U00002A34', - "lowast;": '\U00002217', - "lowbar;": '\U0000005F', - "loz;": '\U000025CA', - "lozenge;": '\U000025CA', - "lozf;": '\U000029EB', - "lpar;": '\U00000028', - "lparlt;": '\U00002993', - "lrarr;": '\U000021C6', - "lrcorner;": '\U0000231F', - "lrhar;": '\U000021CB', - "lrhard;": '\U0000296D', - "lrm;": '\U0000200E', - "lrtri;": '\U000022BF', - "lsaquo;": '\U00002039', - "lscr;": '\U0001D4C1', - "lsh;": '\U000021B0', - "lsim;": '\U00002272', - "lsime;": '\U00002A8D', - "lsimg;": '\U00002A8F', - "lsqb;": '\U0000005B', - "lsquo;": '\U00002018', - "lsquor;": '\U0000201A', - "lstrok;": '\U00000142', - "lt;": '\U0000003C', - "ltcc;": '\U00002AA6', - "ltcir;": '\U00002A79', - "ltdot;": '\U000022D6', - "lthree;": '\U000022CB', - "ltimes;": '\U000022C9', - "ltlarr;": '\U00002976', - "ltquest;": '\U00002A7B', - "ltrPar;": '\U00002996', - "ltri;": '\U000025C3', - "ltrie;": '\U000022B4', - "ltrif;": '\U000025C2', - "lurdshar;": '\U0000294A', - "luruhar;": '\U00002966', - "mDDot;": '\U0000223A', - "macr;": '\U000000AF', - "male;": '\U00002642', - "malt;": '\U00002720', - "maltese;": '\U00002720', - "map;": '\U000021A6', - "mapsto;": '\U000021A6', - "mapstodown;": '\U000021A7', - "mapstoleft;": '\U000021A4', - "mapstoup;": '\U000021A5', - "marker;": '\U000025AE', - "mcomma;": '\U00002A29', - "mcy;": '\U0000043C', - "mdash;": '\U00002014', - "measuredangle;": '\U00002221', - "mfr;": '\U0001D52A', - "mho;": '\U00002127', - "micro;": '\U000000B5', - "mid;": '\U00002223', - "midast;": '\U0000002A', - "midcir;": '\U00002AF0', - "middot;": '\U000000B7', - "minus;": '\U00002212', - "minusb;": '\U0000229F', - "minusd;": '\U00002238', - "minusdu;": '\U00002A2A', - "mlcp;": '\U00002ADB', - "mldr;": '\U00002026', - "mnplus;": '\U00002213', - "models;": '\U000022A7', - "mopf;": '\U0001D55E', - "mp;": '\U00002213', - "mscr;": '\U0001D4C2', - "mstpos;": '\U0000223E', - "mu;": '\U000003BC', - "multimap;": '\U000022B8', - "mumap;": '\U000022B8', - "nLeftarrow;": '\U000021CD', - "nLeftrightarrow;": '\U000021CE', - "nRightarrow;": '\U000021CF', - "nVDash;": '\U000022AF', - "nVdash;": '\U000022AE', - "nabla;": '\U00002207', - "nacute;": '\U00000144', - "nap;": '\U00002249', - "napos;": '\U00000149', - "napprox;": '\U00002249', - "natur;": '\U0000266E', - "natural;": '\U0000266E', - "naturals;": '\U00002115', - "nbsp;": '\U000000A0', - "ncap;": '\U00002A43', - "ncaron;": '\U00000148', - "ncedil;": '\U00000146', - "ncong;": '\U00002247', - "ncup;": '\U00002A42', - "ncy;": '\U0000043D', - "ndash;": '\U00002013', - "ne;": '\U00002260', - "neArr;": '\U000021D7', - "nearhk;": '\U00002924', - "nearr;": '\U00002197', - "nearrow;": '\U00002197', - "nequiv;": '\U00002262', - "nesear;": '\U00002928', - "nexist;": '\U00002204', - "nexists;": '\U00002204', - "nfr;": '\U0001D52B', - "nge;": '\U00002271', - "ngeq;": '\U00002271', - "ngsim;": '\U00002275', - "ngt;": '\U0000226F', - "ngtr;": '\U0000226F', - "nhArr;": '\U000021CE', - "nharr;": '\U000021AE', - "nhpar;": '\U00002AF2', - "ni;": '\U0000220B', - "nis;": '\U000022FC', - "nisd;": '\U000022FA', - "niv;": '\U0000220B', - "njcy;": '\U0000045A', - "nlArr;": '\U000021CD', - "nlarr;": '\U0000219A', - "nldr;": '\U00002025', - "nle;": '\U00002270', - "nleftarrow;": '\U0000219A', - "nleftrightarrow;": '\U000021AE', - "nleq;": '\U00002270', - "nless;": '\U0000226E', - "nlsim;": '\U00002274', - "nlt;": '\U0000226E', - "nltri;": '\U000022EA', - "nltrie;": '\U000022EC', - "nmid;": '\U00002224', - "nopf;": '\U0001D55F', - "not;": '\U000000AC', - "notin;": '\U00002209', - "notinva;": '\U00002209', - "notinvb;": '\U000022F7', - "notinvc;": '\U000022F6', - "notni;": '\U0000220C', - "notniva;": '\U0000220C', - "notnivb;": '\U000022FE', - "notnivc;": '\U000022FD', - "npar;": '\U00002226', - "nparallel;": '\U00002226', - "npolint;": '\U00002A14', - "npr;": '\U00002280', - "nprcue;": '\U000022E0', - "nprec;": '\U00002280', - "nrArr;": '\U000021CF', - "nrarr;": '\U0000219B', - "nrightarrow;": '\U0000219B', - "nrtri;": '\U000022EB', - "nrtrie;": '\U000022ED', - "nsc;": '\U00002281', - "nsccue;": '\U000022E1', - "nscr;": '\U0001D4C3', - "nshortmid;": '\U00002224', - "nshortparallel;": '\U00002226', - "nsim;": '\U00002241', - "nsime;": '\U00002244', - "nsimeq;": '\U00002244', - "nsmid;": '\U00002224', - "nspar;": '\U00002226', - "nsqsube;": '\U000022E2', - "nsqsupe;": '\U000022E3', - "nsub;": '\U00002284', - "nsube;": '\U00002288', - "nsubseteq;": '\U00002288', - "nsucc;": '\U00002281', - "nsup;": '\U00002285', - "nsupe;": '\U00002289', - "nsupseteq;": '\U00002289', - "ntgl;": '\U00002279', - "ntilde;": '\U000000F1', - "ntlg;": '\U00002278', - "ntriangleleft;": '\U000022EA', - "ntrianglelefteq;": '\U000022EC', - "ntriangleright;": '\U000022EB', - "ntrianglerighteq;": '\U000022ED', - "nu;": '\U000003BD', - "num;": '\U00000023', - "numero;": '\U00002116', - "numsp;": '\U00002007', - "nvDash;": '\U000022AD', - "nvHarr;": '\U00002904', - "nvdash;": '\U000022AC', - "nvinfin;": '\U000029DE', - "nvlArr;": '\U00002902', - "nvrArr;": '\U00002903', - "nwArr;": '\U000021D6', - "nwarhk;": '\U00002923', - "nwarr;": '\U00002196', - "nwarrow;": '\U00002196', - "nwnear;": '\U00002927', - "oS;": '\U000024C8', - "oacute;": '\U000000F3', - "oast;": '\U0000229B', - "ocir;": '\U0000229A', - "ocirc;": '\U000000F4', - "ocy;": '\U0000043E', - "odash;": '\U0000229D', - "odblac;": '\U00000151', - "odiv;": '\U00002A38', - "odot;": '\U00002299', - "odsold;": '\U000029BC', - "oelig;": '\U00000153', - "ofcir;": '\U000029BF', - "ofr;": '\U0001D52C', - "ogon;": '\U000002DB', - "ograve;": '\U000000F2', - "ogt;": '\U000029C1', - "ohbar;": '\U000029B5', - "ohm;": '\U000003A9', - "oint;": '\U0000222E', - "olarr;": '\U000021BA', - "olcir;": '\U000029BE', - "olcross;": '\U000029BB', - "oline;": '\U0000203E', - "olt;": '\U000029C0', - "omacr;": '\U0000014D', - "omega;": '\U000003C9', - "omicron;": '\U000003BF', - "omid;": '\U000029B6', - "ominus;": '\U00002296', - "oopf;": '\U0001D560', - "opar;": '\U000029B7', - "operp;": '\U000029B9', - "oplus;": '\U00002295', - "or;": '\U00002228', - "orarr;": '\U000021BB', - "ord;": '\U00002A5D', - "order;": '\U00002134', - "orderof;": '\U00002134', - "ordf;": '\U000000AA', - "ordm;": '\U000000BA', - "origof;": '\U000022B6', - "oror;": '\U00002A56', - "orslope;": '\U00002A57', - "orv;": '\U00002A5B', - "oscr;": '\U00002134', - "oslash;": '\U000000F8', - "osol;": '\U00002298', - "otilde;": '\U000000F5', - "otimes;": '\U00002297', - "otimesas;": '\U00002A36', - "ouml;": '\U000000F6', - "ovbar;": '\U0000233D', - "par;": '\U00002225', - "para;": '\U000000B6', - "parallel;": '\U00002225', - "parsim;": '\U00002AF3', - "parsl;": '\U00002AFD', - "part;": '\U00002202', - "pcy;": '\U0000043F', - "percnt;": '\U00000025', - "period;": '\U0000002E', - "permil;": '\U00002030', - "perp;": '\U000022A5', - "pertenk;": '\U00002031', - "pfr;": '\U0001D52D', - "phi;": '\U000003C6', - "phiv;": '\U000003D5', - "phmmat;": '\U00002133', - "phone;": '\U0000260E', - "pi;": '\U000003C0', - "pitchfork;": '\U000022D4', - "piv;": '\U000003D6', - "planck;": '\U0000210F', - "planckh;": '\U0000210E', - "plankv;": '\U0000210F', - "plus;": '\U0000002B', - "plusacir;": '\U00002A23', - "plusb;": '\U0000229E', - "pluscir;": '\U00002A22', - "plusdo;": '\U00002214', - "plusdu;": '\U00002A25', - "pluse;": '\U00002A72', - "plusmn;": '\U000000B1', - "plussim;": '\U00002A26', - "plustwo;": '\U00002A27', - "pm;": '\U000000B1', - "pointint;": '\U00002A15', - "popf;": '\U0001D561', - "pound;": '\U000000A3', - "pr;": '\U0000227A', - "prE;": '\U00002AB3', - "prap;": '\U00002AB7', - "prcue;": '\U0000227C', - "pre;": '\U00002AAF', - "prec;": '\U0000227A', - "precapprox;": '\U00002AB7', - "preccurlyeq;": '\U0000227C', - "preceq;": '\U00002AAF', - "precnapprox;": '\U00002AB9', - "precneqq;": '\U00002AB5', - "precnsim;": '\U000022E8', - "precsim;": '\U0000227E', - "prime;": '\U00002032', - "primes;": '\U00002119', - "prnE;": '\U00002AB5', - "prnap;": '\U00002AB9', - "prnsim;": '\U000022E8', - "prod;": '\U0000220F', - "profalar;": '\U0000232E', - "profline;": '\U00002312', - "profsurf;": '\U00002313', - "prop;": '\U0000221D', - "propto;": '\U0000221D', - "prsim;": '\U0000227E', - "prurel;": '\U000022B0', - "pscr;": '\U0001D4C5', - "psi;": '\U000003C8', - "puncsp;": '\U00002008', - "qfr;": '\U0001D52E', - "qint;": '\U00002A0C', - "qopf;": '\U0001D562', - "qprime;": '\U00002057', - "qscr;": '\U0001D4C6', - "quaternions;": '\U0000210D', - "quatint;": '\U00002A16', - "quest;": '\U0000003F', - "questeq;": '\U0000225F', - "quot;": '\U00000022', - "rAarr;": '\U000021DB', - "rArr;": '\U000021D2', - "rAtail;": '\U0000291C', - "rBarr;": '\U0000290F', - "rHar;": '\U00002964', - "racute;": '\U00000155', - "radic;": '\U0000221A', - "raemptyv;": '\U000029B3', - "rang;": '\U000027E9', - "rangd;": '\U00002992', - "range;": '\U000029A5', - "rangle;": '\U000027E9', - "raquo;": '\U000000BB', - "rarr;": '\U00002192', - "rarrap;": '\U00002975', - "rarrb;": '\U000021E5', - "rarrbfs;": '\U00002920', - "rarrc;": '\U00002933', - "rarrfs;": '\U0000291E', - "rarrhk;": '\U000021AA', - "rarrlp;": '\U000021AC', - "rarrpl;": '\U00002945', - "rarrsim;": '\U00002974', - "rarrtl;": '\U000021A3', - "rarrw;": '\U0000219D', - "ratail;": '\U0000291A', - "ratio;": '\U00002236', - "rationals;": '\U0000211A', - "rbarr;": '\U0000290D', - "rbbrk;": '\U00002773', - "rbrace;": '\U0000007D', - "rbrack;": '\U0000005D', - "rbrke;": '\U0000298C', - "rbrksld;": '\U0000298E', - "rbrkslu;": '\U00002990', - "rcaron;": '\U00000159', - "rcedil;": '\U00000157', - "rceil;": '\U00002309', - "rcub;": '\U0000007D', - "rcy;": '\U00000440', - "rdca;": '\U00002937', - "rdldhar;": '\U00002969', - "rdquo;": '\U0000201D', - "rdquor;": '\U0000201D', - "rdsh;": '\U000021B3', - "real;": '\U0000211C', - "realine;": '\U0000211B', - "realpart;": '\U0000211C', - "reals;": '\U0000211D', - "rect;": '\U000025AD', - "reg;": '\U000000AE', - "rfisht;": '\U0000297D', - "rfloor;": '\U0000230B', - "rfr;": '\U0001D52F', - "rhard;": '\U000021C1', - "rharu;": '\U000021C0', - "rharul;": '\U0000296C', - "rho;": '\U000003C1', - "rhov;": '\U000003F1', - "rightarrow;": '\U00002192', - "rightarrowtail;": '\U000021A3', - "rightharpoondown;": '\U000021C1', - "rightharpoonup;": '\U000021C0', - "rightleftarrows;": '\U000021C4', - "rightleftharpoons;": '\U000021CC', - "rightrightarrows;": '\U000021C9', - "rightsquigarrow;": '\U0000219D', - "rightthreetimes;": '\U000022CC', - "ring;": '\U000002DA', - "risingdotseq;": '\U00002253', - "rlarr;": '\U000021C4', - "rlhar;": '\U000021CC', - "rlm;": '\U0000200F', - "rmoust;": '\U000023B1', - "rmoustache;": '\U000023B1', - "rnmid;": '\U00002AEE', - "roang;": '\U000027ED', - "roarr;": '\U000021FE', - "robrk;": '\U000027E7', - "ropar;": '\U00002986', - "ropf;": '\U0001D563', - "roplus;": '\U00002A2E', - "rotimes;": '\U00002A35', - "rpar;": '\U00000029', - "rpargt;": '\U00002994', - "rppolint;": '\U00002A12', - "rrarr;": '\U000021C9', - "rsaquo;": '\U0000203A', - "rscr;": '\U0001D4C7', - "rsh;": '\U000021B1', - "rsqb;": '\U0000005D', - "rsquo;": '\U00002019', - "rsquor;": '\U00002019', - "rthree;": '\U000022CC', - "rtimes;": '\U000022CA', - "rtri;": '\U000025B9', - "rtrie;": '\U000022B5', - "rtrif;": '\U000025B8', - "rtriltri;": '\U000029CE', - "ruluhar;": '\U00002968', - "rx;": '\U0000211E', - "sacute;": '\U0000015B', - "sbquo;": '\U0000201A', - "sc;": '\U0000227B', - "scE;": '\U00002AB4', - "scap;": '\U00002AB8', - "scaron;": '\U00000161', - "sccue;": '\U0000227D', - "sce;": '\U00002AB0', - "scedil;": '\U0000015F', - "scirc;": '\U0000015D', - "scnE;": '\U00002AB6', - "scnap;": '\U00002ABA', - "scnsim;": '\U000022E9', - "scpolint;": '\U00002A13', - "scsim;": '\U0000227F', - "scy;": '\U00000441', - "sdot;": '\U000022C5', - "sdotb;": '\U000022A1', - "sdote;": '\U00002A66', - "seArr;": '\U000021D8', - "searhk;": '\U00002925', - "searr;": '\U00002198', - "searrow;": '\U00002198', - "sect;": '\U000000A7', - "semi;": '\U0000003B', - "seswar;": '\U00002929', - "setminus;": '\U00002216', - "setmn;": '\U00002216', - "sext;": '\U00002736', - "sfr;": '\U0001D530', - "sfrown;": '\U00002322', - "sharp;": '\U0000266F', - "shchcy;": '\U00000449', - "shcy;": '\U00000448', - "shortmid;": '\U00002223', - "shortparallel;": '\U00002225', - "shy;": '\U000000AD', - "sigma;": '\U000003C3', - "sigmaf;": '\U000003C2', - "sigmav;": '\U000003C2', - "sim;": '\U0000223C', - "simdot;": '\U00002A6A', - "sime;": '\U00002243', - "simeq;": '\U00002243', - "simg;": '\U00002A9E', - "simgE;": '\U00002AA0', - "siml;": '\U00002A9D', - "simlE;": '\U00002A9F', - "simne;": '\U00002246', - "simplus;": '\U00002A24', - "simrarr;": '\U00002972', - "slarr;": '\U00002190', - "smallsetminus;": '\U00002216', - "smashp;": '\U00002A33', - "smeparsl;": '\U000029E4', - "smid;": '\U00002223', - "smile;": '\U00002323', - "smt;": '\U00002AAA', - "smte;": '\U00002AAC', - "softcy;": '\U0000044C', - "sol;": '\U0000002F', - "solb;": '\U000029C4', - "solbar;": '\U0000233F', - "sopf;": '\U0001D564', - "spades;": '\U00002660', - "spadesuit;": '\U00002660', - "spar;": '\U00002225', - "sqcap;": '\U00002293', - "sqcup;": '\U00002294', - "sqsub;": '\U0000228F', - "sqsube;": '\U00002291', - "sqsubset;": '\U0000228F', - "sqsubseteq;": '\U00002291', - "sqsup;": '\U00002290', - "sqsupe;": '\U00002292', - "sqsupset;": '\U00002290', - "sqsupseteq;": '\U00002292', - "squ;": '\U000025A1', - "square;": '\U000025A1', - "squarf;": '\U000025AA', - "squf;": '\U000025AA', - "srarr;": '\U00002192', - "sscr;": '\U0001D4C8', - "ssetmn;": '\U00002216', - "ssmile;": '\U00002323', - "sstarf;": '\U000022C6', - "star;": '\U00002606', - "starf;": '\U00002605', - "straightepsilon;": '\U000003F5', - "straightphi;": '\U000003D5', - "strns;": '\U000000AF', - "sub;": '\U00002282', - "subE;": '\U00002AC5', - "subdot;": '\U00002ABD', - "sube;": '\U00002286', - "subedot;": '\U00002AC3', - "submult;": '\U00002AC1', - "subnE;": '\U00002ACB', - "subne;": '\U0000228A', - "subplus;": '\U00002ABF', - "subrarr;": '\U00002979', - "subset;": '\U00002282', - "subseteq;": '\U00002286', - "subseteqq;": '\U00002AC5', - "subsetneq;": '\U0000228A', - "subsetneqq;": '\U00002ACB', - "subsim;": '\U00002AC7', - "subsub;": '\U00002AD5', - "subsup;": '\U00002AD3', - "succ;": '\U0000227B', - "succapprox;": '\U00002AB8', - "succcurlyeq;": '\U0000227D', - "succeq;": '\U00002AB0', - "succnapprox;": '\U00002ABA', - "succneqq;": '\U00002AB6', - "succnsim;": '\U000022E9', - "succsim;": '\U0000227F', - "sum;": '\U00002211', - "sung;": '\U0000266A', - "sup;": '\U00002283', - "sup1;": '\U000000B9', - "sup2;": '\U000000B2', - "sup3;": '\U000000B3', - "supE;": '\U00002AC6', - "supdot;": '\U00002ABE', - "supdsub;": '\U00002AD8', - "supe;": '\U00002287', - "supedot;": '\U00002AC4', - "suphsol;": '\U000027C9', - "suphsub;": '\U00002AD7', - "suplarr;": '\U0000297B', - "supmult;": '\U00002AC2', - "supnE;": '\U00002ACC', - "supne;": '\U0000228B', - "supplus;": '\U00002AC0', - "supset;": '\U00002283', - "supseteq;": '\U00002287', - "supseteqq;": '\U00002AC6', - "supsetneq;": '\U0000228B', - "supsetneqq;": '\U00002ACC', - "supsim;": '\U00002AC8', - "supsub;": '\U00002AD4', - "supsup;": '\U00002AD6', - "swArr;": '\U000021D9', - "swarhk;": '\U00002926', - "swarr;": '\U00002199', - "swarrow;": '\U00002199', - "swnwar;": '\U0000292A', - "szlig;": '\U000000DF', - "target;": '\U00002316', - "tau;": '\U000003C4', - "tbrk;": '\U000023B4', - "tcaron;": '\U00000165', - "tcedil;": '\U00000163', - "tcy;": '\U00000442', - "tdot;": '\U000020DB', - "telrec;": '\U00002315', - "tfr;": '\U0001D531', - "there4;": '\U00002234', - "therefore;": '\U00002234', - "theta;": '\U000003B8', - "thetasym;": '\U000003D1', - "thetav;": '\U000003D1', - "thickapprox;": '\U00002248', - "thicksim;": '\U0000223C', - "thinsp;": '\U00002009', - "thkap;": '\U00002248', - "thksim;": '\U0000223C', - "thorn;": '\U000000FE', - "tilde;": '\U000002DC', - "times;": '\U000000D7', - "timesb;": '\U000022A0', - "timesbar;": '\U00002A31', - "timesd;": '\U00002A30', - "tint;": '\U0000222D', - "toea;": '\U00002928', - "top;": '\U000022A4', - "topbot;": '\U00002336', - "topcir;": '\U00002AF1', - "topf;": '\U0001D565', - "topfork;": '\U00002ADA', - "tosa;": '\U00002929', - "tprime;": '\U00002034', - "trade;": '\U00002122', - "triangle;": '\U000025B5', - "triangledown;": '\U000025BF', - "triangleleft;": '\U000025C3', - "trianglelefteq;": '\U000022B4', - "triangleq;": '\U0000225C', - "triangleright;": '\U000025B9', - "trianglerighteq;": '\U000022B5', - "tridot;": '\U000025EC', - "trie;": '\U0000225C', - "triminus;": '\U00002A3A', - "triplus;": '\U00002A39', - "trisb;": '\U000029CD', - "tritime;": '\U00002A3B', - "trpezium;": '\U000023E2', - "tscr;": '\U0001D4C9', - "tscy;": '\U00000446', - "tshcy;": '\U0000045B', - "tstrok;": '\U00000167', - "twixt;": '\U0000226C', - "twoheadleftarrow;": '\U0000219E', - "twoheadrightarrow;": '\U000021A0', - "uArr;": '\U000021D1', - "uHar;": '\U00002963', - "uacute;": '\U000000FA', - "uarr;": '\U00002191', - "ubrcy;": '\U0000045E', - "ubreve;": '\U0000016D', - "ucirc;": '\U000000FB', - "ucy;": '\U00000443', - "udarr;": '\U000021C5', - "udblac;": '\U00000171', - "udhar;": '\U0000296E', - "ufisht;": '\U0000297E', - "ufr;": '\U0001D532', - "ugrave;": '\U000000F9', - "uharl;": '\U000021BF', - "uharr;": '\U000021BE', - "uhblk;": '\U00002580', - "ulcorn;": '\U0000231C', - "ulcorner;": '\U0000231C', - "ulcrop;": '\U0000230F', - "ultri;": '\U000025F8', - "umacr;": '\U0000016B', - "uml;": '\U000000A8', - "uogon;": '\U00000173', - "uopf;": '\U0001D566', - "uparrow;": '\U00002191', - "updownarrow;": '\U00002195', - "upharpoonleft;": '\U000021BF', - "upharpoonright;": '\U000021BE', - "uplus;": '\U0000228E', - "upsi;": '\U000003C5', - "upsih;": '\U000003D2', - "upsilon;": '\U000003C5', - "upuparrows;": '\U000021C8', - "urcorn;": '\U0000231D', - "urcorner;": '\U0000231D', - "urcrop;": '\U0000230E', - "uring;": '\U0000016F', - "urtri;": '\U000025F9', - "uscr;": '\U0001D4CA', - "utdot;": '\U000022F0', - "utilde;": '\U00000169', - "utri;": '\U000025B5', - "utrif;": '\U000025B4', - "uuarr;": '\U000021C8', - "uuml;": '\U000000FC', - "uwangle;": '\U000029A7', - "vArr;": '\U000021D5', - "vBar;": '\U00002AE8', - "vBarv;": '\U00002AE9', - "vDash;": '\U000022A8', - "vangrt;": '\U0000299C', - "varepsilon;": '\U000003F5', - "varkappa;": '\U000003F0', - "varnothing;": '\U00002205', - "varphi;": '\U000003D5', - "varpi;": '\U000003D6', - "varpropto;": '\U0000221D', - "varr;": '\U00002195', - "varrho;": '\U000003F1', - "varsigma;": '\U000003C2', - "vartheta;": '\U000003D1', - "vartriangleleft;": '\U000022B2', - "vartriangleright;": '\U000022B3', - "vcy;": '\U00000432', - "vdash;": '\U000022A2', - "vee;": '\U00002228', - "veebar;": '\U000022BB', - "veeeq;": '\U0000225A', - "vellip;": '\U000022EE', - "verbar;": '\U0000007C', - "vert;": '\U0000007C', - "vfr;": '\U0001D533', - "vltri;": '\U000022B2', - "vopf;": '\U0001D567', - "vprop;": '\U0000221D', - "vrtri;": '\U000022B3', - "vscr;": '\U0001D4CB', - "vzigzag;": '\U0000299A', - "wcirc;": '\U00000175', - "wedbar;": '\U00002A5F', - "wedge;": '\U00002227', - "wedgeq;": '\U00002259', - "weierp;": '\U00002118', - "wfr;": '\U0001D534', - "wopf;": '\U0001D568', - "wp;": '\U00002118', - "wr;": '\U00002240', - "wreath;": '\U00002240', - "wscr;": '\U0001D4CC', - "xcap;": '\U000022C2', - "xcirc;": '\U000025EF', - "xcup;": '\U000022C3', - "xdtri;": '\U000025BD', - "xfr;": '\U0001D535', - "xhArr;": '\U000027FA', - "xharr;": '\U000027F7', - "xi;": '\U000003BE', - "xlArr;": '\U000027F8', - "xlarr;": '\U000027F5', - "xmap;": '\U000027FC', - "xnis;": '\U000022FB', - "xodot;": '\U00002A00', - "xopf;": '\U0001D569', - "xoplus;": '\U00002A01', - "xotime;": '\U00002A02', - "xrArr;": '\U000027F9', - "xrarr;": '\U000027F6', - "xscr;": '\U0001D4CD', - "xsqcup;": '\U00002A06', - "xuplus;": '\U00002A04', - "xutri;": '\U000025B3', - "xvee;": '\U000022C1', - "xwedge;": '\U000022C0', - "yacute;": '\U000000FD', - "yacy;": '\U0000044F', - "ycirc;": '\U00000177', - "ycy;": '\U0000044B', - "yen;": '\U000000A5', - "yfr;": '\U0001D536', - "yicy;": '\U00000457', - "yopf;": '\U0001D56A', - "yscr;": '\U0001D4CE', - "yucy;": '\U0000044E', - "yuml;": '\U000000FF', - "zacute;": '\U0000017A', - "zcaron;": '\U0000017E', - "zcy;": '\U00000437', - "zdot;": '\U0000017C', - "zeetrf;": '\U00002128', - "zeta;": '\U000003B6', - "zfr;": '\U0001D537', - "zhcy;": '\U00000436', - "zigrarr;": '\U000021DD', - "zopf;": '\U0001D56B', - "zscr;": '\U0001D4CF', - "zwj;": '\U0000200D', - "zwnj;": '\U0000200C', - "AElig": '\U000000C6', - "AMP": '\U00000026', - "Aacute": '\U000000C1', - "Acirc": '\U000000C2', - "Agrave": '\U000000C0', - "Aring": '\U000000C5', - "Atilde": '\U000000C3', - "Auml": '\U000000C4', - "COPY": '\U000000A9', - "Ccedil": '\U000000C7', - "ETH": '\U000000D0', - "Eacute": '\U000000C9', - "Ecirc": '\U000000CA', - "Egrave": '\U000000C8', - "Euml": '\U000000CB', - "GT": '\U0000003E', - "Iacute": '\U000000CD', - "Icirc": '\U000000CE', - "Igrave": '\U000000CC', - "Iuml": '\U000000CF', - "LT": '\U0000003C', - "Ntilde": '\U000000D1', - "Oacute": '\U000000D3', - "Ocirc": '\U000000D4', - "Ograve": '\U000000D2', - "Oslash": '\U000000D8', - "Otilde": '\U000000D5', - "Ouml": '\U000000D6', - "QUOT": '\U00000022', - "REG": '\U000000AE', - "THORN": '\U000000DE', - "Uacute": '\U000000DA', - "Ucirc": '\U000000DB', - "Ugrave": '\U000000D9', - "Uuml": '\U000000DC', - "Yacute": '\U000000DD', - "aacute": '\U000000E1', - "acirc": '\U000000E2', - "acute": '\U000000B4', - "aelig": '\U000000E6', - "agrave": '\U000000E0', - "amp": '\U00000026', - "aring": '\U000000E5', - "atilde": '\U000000E3', - "auml": '\U000000E4', - "brvbar": '\U000000A6', - "ccedil": '\U000000E7', - "cedil": '\U000000B8', - "cent": '\U000000A2', - "copy": '\U000000A9', - "curren": '\U000000A4', - "deg": '\U000000B0', - "divide": '\U000000F7', - "eacute": '\U000000E9', - "ecirc": '\U000000EA', - "egrave": '\U000000E8', - "eth": '\U000000F0', - "euml": '\U000000EB', - "frac12": '\U000000BD', - "frac14": '\U000000BC', - "frac34": '\U000000BE', - "gt": '\U0000003E', - "iacute": '\U000000ED', - "icirc": '\U000000EE', - "iexcl": '\U000000A1', - "igrave": '\U000000EC', - "iquest": '\U000000BF', - "iuml": '\U000000EF', - "laquo": '\U000000AB', - "lt": '\U0000003C', - "macr": '\U000000AF', - "micro": '\U000000B5', - "middot": '\U000000B7', - "nbsp": '\U000000A0', - "not": '\U000000AC', - "ntilde": '\U000000F1', - "oacute": '\U000000F3', - "ocirc": '\U000000F4', - "ograve": '\U000000F2', - "ordf": '\U000000AA', - "ordm": '\U000000BA', - "oslash": '\U000000F8', - "otilde": '\U000000F5', - "ouml": '\U000000F6', - "para": '\U000000B6', - "plusmn": '\U000000B1', - "pound": '\U000000A3', - "quot": '\U00000022', - "raquo": '\U000000BB', - "reg": '\U000000AE', - "sect": '\U000000A7', - "shy": '\U000000AD', - "sup1": '\U000000B9', - "sup2": '\U000000B2', - "sup3": '\U000000B3', - "szlig": '\U000000DF', - "thorn": '\U000000FE', - "times": '\U000000D7', - "uacute": '\U000000FA', - "ucirc": '\U000000FB', - "ugrave": '\U000000F9', - "uml": '\U000000A8', - "uuml": '\U000000FC', - "yacute": '\U000000FD', - "yen": '\U000000A5', - "yuml": '\U000000FF', + "Cross;": '\U00002A2F', + "Cscr;": '\U0001D49E', + "Cup;": '\U000022D3', + "CupCap;": '\U0000224D', + "DD;": '\U00002145', + "DDotrahd;": '\U00002911', + "DJcy;": '\U00000402', + "DScy;": '\U00000405', + "DZcy;": '\U0000040F', + "Dagger;": '\U00002021', + "Darr;": '\U000021A1', + "Dashv;": '\U00002AE4', + "Dcaron;": '\U0000010E', + "Dcy;": '\U00000414', + "Del;": '\U00002207', + "Delta;": '\U00000394', + "Dfr;": '\U0001D507', + "DiacriticalAcute;": '\U000000B4', + "DiacriticalDot;": '\U000002D9', + "DiacriticalDoubleAcute;": '\U000002DD', + "DiacriticalGrave;": '\U00000060', + "DiacriticalTilde;": '\U000002DC', + "Diamond;": '\U000022C4', + "DifferentialD;": '\U00002146', + "Dopf;": '\U0001D53B', + "Dot;": '\U000000A8', + "DotDot;": '\U000020DC', + "DotEqual;": '\U00002250', + "DoubleContourIntegral;": '\U0000222F', + "DoubleDot;": '\U000000A8', + "DoubleDownArrow;": '\U000021D3', + "DoubleLeftArrow;": '\U000021D0', + "DoubleLeftRightArrow;": '\U000021D4', + "DoubleLeftTee;": '\U00002AE4', + "DoubleLongLeftArrow;": '\U000027F8', + "DoubleLongLeftRightArrow;": '\U000027FA', + "DoubleLongRightArrow;": '\U000027F9', + "DoubleRightArrow;": '\U000021D2', + "DoubleRightTee;": '\U000022A8', + "DoubleUpArrow;": '\U000021D1', + "DoubleUpDownArrow;": '\U000021D5', + "DoubleVerticalBar;": '\U00002225', + "DownArrow;": '\U00002193', + "DownArrowBar;": '\U00002913', + "DownArrowUpArrow;": '\U000021F5', + "DownBreve;": '\U00000311', + "DownLeftRightVector;": '\U00002950', + "DownLeftTeeVector;": '\U0000295E', + "DownLeftVector;": '\U000021BD', + "DownLeftVectorBar;": '\U00002956', + "DownRightTeeVector;": '\U0000295F', + "DownRightVector;": '\U000021C1', + "DownRightVectorBar;": '\U00002957', + "DownTee;": '\U000022A4', + "DownTeeArrow;": '\U000021A7', + "Downarrow;": '\U000021D3', + "Dscr;": '\U0001D49F', + "Dstrok;": '\U00000110', + "ENG;": '\U0000014A', + "ETH;": '\U000000D0', + "Eacute;": '\U000000C9', + "Ecaron;": '\U0000011A', + "Ecirc;": '\U000000CA', + "Ecy;": '\U0000042D', + "Edot;": '\U00000116', + "Efr;": '\U0001D508', + "Egrave;": '\U000000C8', + "Element;": '\U00002208', + "Emacr;": '\U00000112', + "EmptySmallSquare;": '\U000025FB', + "EmptyVerySmallSquare;": '\U000025AB', + "Eogon;": '\U00000118', + "Eopf;": '\U0001D53C', + "Epsilon;": '\U00000395', + "Equal;": '\U00002A75', + "EqualTilde;": '\U00002242', + "Equilibrium;": '\U000021CC', + "Escr;": '\U00002130', + "Esim;": '\U00002A73', + "Eta;": '\U00000397', + "Euml;": '\U000000CB', + "Exists;": '\U00002203', + "ExponentialE;": '\U00002147', + "Fcy;": '\U00000424', + "Ffr;": '\U0001D509', + "FilledSmallSquare;": '\U000025FC', + "FilledVerySmallSquare;": '\U000025AA', + "Fopf;": '\U0001D53D', + "ForAll;": '\U00002200', + "Fouriertrf;": '\U00002131', + "Fscr;": '\U00002131', + "GJcy;": '\U00000403', + "GT;": '\U0000003E', + "Gamma;": '\U00000393', + "Gammad;": '\U000003DC', + "Gbreve;": '\U0000011E', + "Gcedil;": '\U00000122', + "Gcirc;": '\U0000011C', + "Gcy;": '\U00000413', + "Gdot;": '\U00000120', + "Gfr;": '\U0001D50A', + "Gg;": '\U000022D9', + "Gopf;": '\U0001D53E', + "GreaterEqual;": '\U00002265', + "GreaterEqualLess;": '\U000022DB', + "GreaterFullEqual;": '\U00002267', + "GreaterGreater;": '\U00002AA2', + "GreaterLess;": '\U00002277', + "GreaterSlantEqual;": '\U00002A7E', + "GreaterTilde;": '\U00002273', + "Gscr;": '\U0001D4A2', + "Gt;": '\U0000226B', + "HARDcy;": '\U0000042A', + "Hacek;": '\U000002C7', + "Hat;": '\U0000005E', + "Hcirc;": '\U00000124', + "Hfr;": '\U0000210C', + "HilbertSpace;": '\U0000210B', + "Hopf;": '\U0000210D', + "HorizontalLine;": '\U00002500', + "Hscr;": '\U0000210B', + "Hstrok;": '\U00000126', + "HumpDownHump;": '\U0000224E', + "HumpEqual;": '\U0000224F', + "IEcy;": '\U00000415', + "IJlig;": '\U00000132', + "IOcy;": '\U00000401', + "Iacute;": '\U000000CD', + "Icirc;": '\U000000CE', + "Icy;": '\U00000418', + "Idot;": '\U00000130', + "Ifr;": '\U00002111', + "Igrave;": '\U000000CC', + "Im;": '\U00002111', + "Imacr;": '\U0000012A', + "ImaginaryI;": '\U00002148', + "Implies;": '\U000021D2', + "Int;": '\U0000222C', + "Integral;": '\U0000222B', + "Intersection;": '\U000022C2', + "InvisibleComma;": '\U00002063', + "InvisibleTimes;": '\U00002062', + "Iogon;": '\U0000012E', + "Iopf;": '\U0001D540', + "Iota;": '\U00000399', + "Iscr;": '\U00002110', + "Itilde;": '\U00000128', + "Iukcy;": '\U00000406', + "Iuml;": '\U000000CF', + "Jcirc;": '\U00000134', + "Jcy;": '\U00000419', + "Jfr;": '\U0001D50D', + "Jopf;": '\U0001D541', + "Jscr;": '\U0001D4A5', + "Jsercy;": '\U00000408', + "Jukcy;": '\U00000404', + "KHcy;": '\U00000425', + "KJcy;": '\U0000040C', + "Kappa;": '\U0000039A', + "Kcedil;": '\U00000136', + "Kcy;": '\U0000041A', + "Kfr;": '\U0001D50E', + "Kopf;": '\U0001D542', + "Kscr;": '\U0001D4A6', + "LJcy;": '\U00000409', + "LT;": '\U0000003C', + "Lacute;": '\U00000139', + "Lambda;": '\U0000039B', + "Lang;": '\U000027EA', + "Laplacetrf;": '\U00002112', + "Larr;": '\U0000219E', + "Lcaron;": '\U0000013D', + "Lcedil;": '\U0000013B', + "Lcy;": '\U0000041B', + "LeftAngleBracket;": '\U000027E8', + "LeftArrow;": '\U00002190', + "LeftArrowBar;": '\U000021E4', + "LeftArrowRightArrow;": '\U000021C6', + "LeftCeiling;": '\U00002308', + "LeftDoubleBracket;": '\U000027E6', + "LeftDownTeeVector;": '\U00002961', + "LeftDownVector;": '\U000021C3', + "LeftDownVectorBar;": '\U00002959', + "LeftFloor;": '\U0000230A', + "LeftRightArrow;": '\U00002194', + "LeftRightVector;": '\U0000294E', + "LeftTee;": '\U000022A3', + "LeftTeeArrow;": '\U000021A4', + "LeftTeeVector;": '\U0000295A', + "LeftTriangle;": '\U000022B2', + "LeftTriangleBar;": '\U000029CF', + "LeftTriangleEqual;": '\U000022B4', + "LeftUpDownVector;": '\U00002951', + "LeftUpTeeVector;": '\U00002960', + "LeftUpVector;": '\U000021BF', + "LeftUpVectorBar;": '\U00002958', + "LeftVector;": '\U000021BC', + "LeftVectorBar;": '\U00002952', + "Leftarrow;": '\U000021D0', + "Leftrightarrow;": '\U000021D4', + "LessEqualGreater;": '\U000022DA', + "LessFullEqual;": '\U00002266', + "LessGreater;": '\U00002276', + "LessLess;": '\U00002AA1', + "LessSlantEqual;": '\U00002A7D', + "LessTilde;": '\U00002272', + "Lfr;": '\U0001D50F', + "Ll;": '\U000022D8', + "Lleftarrow;": '\U000021DA', + "Lmidot;": '\U0000013F', + "LongLeftArrow;": '\U000027F5', + "LongLeftRightArrow;": '\U000027F7', + "LongRightArrow;": '\U000027F6', + "Longleftarrow;": '\U000027F8', + "Longleftrightarrow;": '\U000027FA', + "Longrightarrow;": '\U000027F9', + "Lopf;": '\U0001D543', + "LowerLeftArrow;": '\U00002199', + "LowerRightArrow;": '\U00002198', + "Lscr;": '\U00002112', + "Lsh;": '\U000021B0', + "Lstrok;": '\U00000141', + "Lt;": '\U0000226A', + "Map;": '\U00002905', + "Mcy;": '\U0000041C', + "MediumSpace;": '\U0000205F', + "Mellintrf;": '\U00002133', + "Mfr;": '\U0001D510', + "MinusPlus;": '\U00002213', + "Mopf;": '\U0001D544', + "Mscr;": '\U00002133', + "Mu;": '\U0000039C', + "NJcy;": '\U0000040A', + "Nacute;": '\U00000143', + "Ncaron;": '\U00000147', + "Ncedil;": '\U00000145', + "Ncy;": '\U0000041D', + "NegativeMediumSpace;": '\U0000200B', + "NegativeThickSpace;": '\U0000200B', + "NegativeThinSpace;": '\U0000200B', + "NegativeVeryThinSpace;": '\U0000200B', + "NestedGreaterGreater;": '\U0000226B', + "NestedLessLess;": '\U0000226A', + "NewLine;": '\U0000000A', + "Nfr;": '\U0001D511', + "NoBreak;": '\U00002060', + "NonBreakingSpace;": '\U000000A0', + "Nopf;": '\U00002115', + "Not;": '\U00002AEC', + "NotCongruent;": '\U00002262', + "NotCupCap;": '\U0000226D', + "NotDoubleVerticalBar;": '\U00002226', + "NotElement;": '\U00002209', + "NotEqual;": '\U00002260', + "NotExists;": '\U00002204', + "NotGreater;": '\U0000226F', + "NotGreaterEqual;": '\U00002271', + "NotGreaterLess;": '\U00002279', + "NotGreaterTilde;": '\U00002275', + "NotLeftTriangle;": '\U000022EA', + "NotLeftTriangleEqual;": '\U000022EC', + "NotLess;": '\U0000226E', + "NotLessEqual;": '\U00002270', + "NotLessGreater;": '\U00002278', + "NotLessTilde;": '\U00002274', + "NotPrecedes;": '\U00002280', + "NotPrecedesSlantEqual;": '\U000022E0', + "NotReverseElement;": '\U0000220C', + "NotRightTriangle;": '\U000022EB', + "NotRightTriangleEqual;": '\U000022ED', + "NotSquareSubsetEqual;": '\U000022E2', + "NotSquareSupersetEqual;": '\U000022E3', + "NotSubsetEqual;": '\U00002288', + "NotSucceeds;": '\U00002281', + "NotSucceedsSlantEqual;": '\U000022E1', + "NotSupersetEqual;": '\U00002289', + "NotTilde;": '\U00002241', + "NotTildeEqual;": '\U00002244', + "NotTildeFullEqual;": '\U00002247', + "NotTildeTilde;": '\U00002249', + "NotVerticalBar;": '\U00002224', + "Nscr;": '\U0001D4A9', + "Ntilde;": '\U000000D1', + "Nu;": '\U0000039D', + "OElig;": '\U00000152', + "Oacute;": '\U000000D3', + "Ocirc;": '\U000000D4', + "Ocy;": '\U0000041E', + "Odblac;": '\U00000150', + "Ofr;": '\U0001D512', + "Ograve;": '\U000000D2', + "Omacr;": '\U0000014C', + "Omega;": '\U000003A9', + "Omicron;": '\U0000039F', + "Oopf;": '\U0001D546', + "OpenCurlyDoubleQuote;": '\U0000201C', + "OpenCurlyQuote;": '\U00002018', + "Or;": '\U00002A54', + "Oscr;": '\U0001D4AA', + "Oslash;": '\U000000D8', + "Otilde;": '\U000000D5', + "Otimes;": '\U00002A37', + "Ouml;": '\U000000D6', + "OverBar;": '\U0000203E', + "OverBrace;": '\U000023DE', + "OverBracket;": '\U000023B4', + "OverParenthesis;": '\U000023DC', + "PartialD;": '\U00002202', + "Pcy;": '\U0000041F', + "Pfr;": '\U0001D513', + "Phi;": '\U000003A6', + "Pi;": '\U000003A0', + "PlusMinus;": '\U000000B1', + "Poincareplane;": '\U0000210C', + "Popf;": '\U00002119', + "Pr;": '\U00002ABB', + "Precedes;": '\U0000227A', + "PrecedesEqual;": '\U00002AAF', + "PrecedesSlantEqual;": '\U0000227C', + "PrecedesTilde;": '\U0000227E', + "Prime;": '\U00002033', + "Product;": '\U0000220F', + "Proportion;": '\U00002237', + "Proportional;": '\U0000221D', + "Pscr;": '\U0001D4AB', + "Psi;": '\U000003A8', + "QUOT;": '\U00000022', + "Qfr;": '\U0001D514', + "Qopf;": '\U0000211A', + "Qscr;": '\U0001D4AC', + "RBarr;": '\U00002910', + "REG;": '\U000000AE', + "Racute;": '\U00000154', + "Rang;": '\U000027EB', + "Rarr;": '\U000021A0', + "Rarrtl;": '\U00002916', + "Rcaron;": '\U00000158', + "Rcedil;": '\U00000156', + "Rcy;": '\U00000420', + "Re;": '\U0000211C', + "ReverseElement;": '\U0000220B', + "ReverseEquilibrium;": '\U000021CB', + "ReverseUpEquilibrium;": '\U0000296F', + "Rfr;": '\U0000211C', + "Rho;": '\U000003A1', + "RightAngleBracket;": '\U000027E9', + "RightArrow;": '\U00002192', + "RightArrowBar;": '\U000021E5', + "RightArrowLeftArrow;": '\U000021C4', + "RightCeiling;": '\U00002309', + "RightDoubleBracket;": '\U000027E7', + "RightDownTeeVector;": '\U0000295D', + "RightDownVector;": '\U000021C2', + "RightDownVectorBar;": '\U00002955', + "RightFloor;": '\U0000230B', + "RightTee;": '\U000022A2', + "RightTeeArrow;": '\U000021A6', + "RightTeeVector;": '\U0000295B', + "RightTriangle;": '\U000022B3', + "RightTriangleBar;": '\U000029D0', + "RightTriangleEqual;": '\U000022B5', + "RightUpDownVector;": '\U0000294F', + "RightUpTeeVector;": '\U0000295C', + "RightUpVector;": '\U000021BE', + "RightUpVectorBar;": '\U00002954', + "RightVector;": '\U000021C0', + "RightVectorBar;": '\U00002953', + "Rightarrow;": '\U000021D2', + "Ropf;": '\U0000211D', + "RoundImplies;": '\U00002970', + "Rrightarrow;": '\U000021DB', + "Rscr;": '\U0000211B', + "Rsh;": '\U000021B1', + "RuleDelayed;": '\U000029F4', + "SHCHcy;": '\U00000429', + "SHcy;": '\U00000428', + "SOFTcy;": '\U0000042C', + "Sacute;": '\U0000015A', + "Sc;": '\U00002ABC', + "Scaron;": '\U00000160', + "Scedil;": '\U0000015E', + "Scirc;": '\U0000015C', + "Scy;": '\U00000421', + "Sfr;": '\U0001D516', + "ShortDownArrow;": '\U00002193', + "ShortLeftArrow;": '\U00002190', + "ShortRightArrow;": '\U00002192', + "ShortUpArrow;": '\U00002191', + "Sigma;": '\U000003A3', + "SmallCircle;": '\U00002218', + "Sopf;": '\U0001D54A', + "Sqrt;": '\U0000221A', + "Square;": '\U000025A1', + "SquareIntersection;": '\U00002293', + "SquareSubset;": '\U0000228F', + "SquareSubsetEqual;": '\U00002291', + "SquareSuperset;": '\U00002290', + "SquareSupersetEqual;": '\U00002292', + "SquareUnion;": '\U00002294', + "Sscr;": '\U0001D4AE', + "Star;": '\U000022C6', + "Sub;": '\U000022D0', + "Subset;": '\U000022D0', + "SubsetEqual;": '\U00002286', + "Succeeds;": '\U0000227B', + "SucceedsEqual;": '\U00002AB0', + "SucceedsSlantEqual;": '\U0000227D', + "SucceedsTilde;": '\U0000227F', + "SuchThat;": '\U0000220B', + "Sum;": '\U00002211', + "Sup;": '\U000022D1', + "Superset;": '\U00002283', + "SupersetEqual;": '\U00002287', + "Supset;": '\U000022D1', + "THORN;": '\U000000DE', + "TRADE;": '\U00002122', + "TSHcy;": '\U0000040B', + "TScy;": '\U00000426', + "Tab;": '\U00000009', + "Tau;": '\U000003A4', + "Tcaron;": '\U00000164', + "Tcedil;": '\U00000162', + "Tcy;": '\U00000422', + "Tfr;": '\U0001D517', + "Therefore;": '\U00002234', + "Theta;": '\U00000398', + "ThinSpace;": '\U00002009', + "Tilde;": '\U0000223C', + "TildeEqual;": '\U00002243', + "TildeFullEqual;": '\U00002245', + "TildeTilde;": '\U00002248', + "Topf;": '\U0001D54B', + "TripleDot;": '\U000020DB', + "Tscr;": '\U0001D4AF', + "Tstrok;": '\U00000166', + "Uacute;": '\U000000DA', + "Uarr;": '\U0000219F', + "Uarrocir;": '\U00002949', + "Ubrcy;": '\U0000040E', + "Ubreve;": '\U0000016C', + "Ucirc;": '\U000000DB', + "Ucy;": '\U00000423', + "Udblac;": '\U00000170', + "Ufr;": '\U0001D518', + "Ugrave;": '\U000000D9', + "Umacr;": '\U0000016A', + "UnderBar;": '\U0000005F', + "UnderBrace;": '\U000023DF', + "UnderBracket;": '\U000023B5', + "UnderParenthesis;": '\U000023DD', + "Union;": '\U000022C3', + "UnionPlus;": '\U0000228E', + "Uogon;": '\U00000172', + "Uopf;": '\U0001D54C', + "UpArrow;": '\U00002191', + "UpArrowBar;": '\U00002912', + "UpArrowDownArrow;": '\U000021C5', + "UpDownArrow;": '\U00002195', + "UpEquilibrium;": '\U0000296E', + "UpTee;": '\U000022A5', + "UpTeeArrow;": '\U000021A5', + "Uparrow;": '\U000021D1', + "Updownarrow;": '\U000021D5', + "UpperLeftArrow;": '\U00002196', + "UpperRightArrow;": '\U00002197', + "Upsi;": '\U000003D2', + "Upsilon;": '\U000003A5', + "Uring;": '\U0000016E', + "Uscr;": '\U0001D4B0', + "Utilde;": '\U00000168', + "Uuml;": '\U000000DC', + "VDash;": '\U000022AB', + "Vbar;": '\U00002AEB', + "Vcy;": '\U00000412', + "Vdash;": '\U000022A9', + "Vdashl;": '\U00002AE6', + "Vee;": '\U000022C1', + "Verbar;": '\U00002016', + "Vert;": '\U00002016', + "VerticalBar;": '\U00002223', + "VerticalLine;": '\U0000007C', + "VerticalSeparator;": '\U00002758', + "VerticalTilde;": '\U00002240', + "VeryThinSpace;": '\U0000200A', + "Vfr;": '\U0001D519', + "Vopf;": '\U0001D54D', + "Vscr;": '\U0001D4B1', + "Vvdash;": '\U000022AA', + "Wcirc;": '\U00000174', + "Wedge;": '\U000022C0', + "Wfr;": '\U0001D51A', + "Wopf;": '\U0001D54E', + "Wscr;": '\U0001D4B2', + "Xfr;": '\U0001D51B', + "Xi;": '\U0000039E', + "Xopf;": '\U0001D54F', + "Xscr;": '\U0001D4B3', + "YAcy;": '\U0000042F', + "YIcy;": '\U00000407', + "YUcy;": '\U0000042E', + "Yacute;": '\U000000DD', + "Ycirc;": '\U00000176', + "Ycy;": '\U0000042B', + "Yfr;": '\U0001D51C', + "Yopf;": '\U0001D550', + "Yscr;": '\U0001D4B4', + "Yuml;": '\U00000178', + "ZHcy;": '\U00000416', + "Zacute;": '\U00000179', + "Zcaron;": '\U0000017D', + "Zcy;": '\U00000417', + "Zdot;": '\U0000017B', + "ZeroWidthSpace;": '\U0000200B', + "Zeta;": '\U00000396', + "Zfr;": '\U00002128', + "Zopf;": '\U00002124', + "Zscr;": '\U0001D4B5', + "aacute;": '\U000000E1', + "abreve;": '\U00000103', + "ac;": '\U0000223E', + "acd;": '\U0000223F', + "acirc;": '\U000000E2', + "acute;": '\U000000B4', + "acy;": '\U00000430', + "aelig;": '\U000000E6', + "af;": '\U00002061', + "afr;": '\U0001D51E', + "agrave;": '\U000000E0', + "alefsym;": '\U00002135', + "aleph;": '\U00002135', + "alpha;": '\U000003B1', + "amacr;": '\U00000101', + "amalg;": '\U00002A3F', + "amp;": '\U00000026', + "and;": '\U00002227', + "andand;": '\U00002A55', + "andd;": '\U00002A5C', + "andslope;": '\U00002A58', + "andv;": '\U00002A5A', + "ang;": '\U00002220', + "ange;": '\U000029A4', + "angle;": '\U00002220', + "angmsd;": '\U00002221', + "angmsdaa;": '\U000029A8', + "angmsdab;": '\U000029A9', + "angmsdac;": '\U000029AA', + "angmsdad;": '\U000029AB', + "angmsdae;": '\U000029AC', + "angmsdaf;": '\U000029AD', + "angmsdag;": '\U000029AE', + "angmsdah;": '\U000029AF', + "angrt;": '\U0000221F', + "angrtvb;": '\U000022BE', + "angrtvbd;": '\U0000299D', + "angsph;": '\U00002222', + "angst;": '\U000000C5', + "angzarr;": '\U0000237C', + "aogon;": '\U00000105', + "aopf;": '\U0001D552', + "ap;": '\U00002248', + "apE;": '\U00002A70', + "apacir;": '\U00002A6F', + "ape;": '\U0000224A', + "apid;": '\U0000224B', + "apos;": '\U00000027', + "approx;": '\U00002248', + "approxeq;": '\U0000224A', + "aring;": '\U000000E5', + "ascr;": '\U0001D4B6', + "ast;": '\U0000002A', + "asymp;": '\U00002248', + "asympeq;": '\U0000224D', + "atilde;": '\U000000E3', + "auml;": '\U000000E4', + "awconint;": '\U00002233', + "awint;": '\U00002A11', + "bNot;": '\U00002AED', + "backcong;": '\U0000224C', + "backepsilon;": '\U000003F6', + "backprime;": '\U00002035', + "backsim;": '\U0000223D', + "backsimeq;": '\U000022CD', + "barvee;": '\U000022BD', + "barwed;": '\U00002305', + "barwedge;": '\U00002305', + "bbrk;": '\U000023B5', + "bbrktbrk;": '\U000023B6', + "bcong;": '\U0000224C', + "bcy;": '\U00000431', + "bdquo;": '\U0000201E', + "becaus;": '\U00002235', + "because;": '\U00002235', + "bemptyv;": '\U000029B0', + "bepsi;": '\U000003F6', + "bernou;": '\U0000212C', + "beta;": '\U000003B2', + "beth;": '\U00002136', + "between;": '\U0000226C', + "bfr;": '\U0001D51F', + "bigcap;": '\U000022C2', + "bigcirc;": '\U000025EF', + "bigcup;": '\U000022C3', + "bigodot;": '\U00002A00', + "bigoplus;": '\U00002A01', + "bigotimes;": '\U00002A02', + "bigsqcup;": '\U00002A06', + "bigstar;": '\U00002605', + "bigtriangledown;": '\U000025BD', + "bigtriangleup;": '\U000025B3', + "biguplus;": '\U00002A04', + "bigvee;": '\U000022C1', + "bigwedge;": '\U000022C0', + "bkarow;": '\U0000290D', + "blacklozenge;": '\U000029EB', + "blacksquare;": '\U000025AA', + "blacktriangle;": '\U000025B4', + "blacktriangledown;": '\U000025BE', + "blacktriangleleft;": '\U000025C2', + "blacktriangleright;": '\U000025B8', + "blank;": '\U00002423', + "blk12;": '\U00002592', + "blk14;": '\U00002591', + "blk34;": '\U00002593', + "block;": '\U00002588', + "bnot;": '\U00002310', + "bopf;": '\U0001D553', + "bot;": '\U000022A5', + "bottom;": '\U000022A5', + "bowtie;": '\U000022C8', + "boxDL;": '\U00002557', + "boxDR;": '\U00002554', + "boxDl;": '\U00002556', + "boxDr;": '\U00002553', + "boxH;": '\U00002550', + "boxHD;": '\U00002566', + "boxHU;": '\U00002569', + "boxHd;": '\U00002564', + "boxHu;": '\U00002567', + "boxUL;": '\U0000255D', + "boxUR;": '\U0000255A', + "boxUl;": '\U0000255C', + "boxUr;": '\U00002559', + "boxV;": '\U00002551', + "boxVH;": '\U0000256C', + "boxVL;": '\U00002563', + "boxVR;": '\U00002560', + "boxVh;": '\U0000256B', + "boxVl;": '\U00002562', + "boxVr;": '\U0000255F', + "boxbox;": '\U000029C9', + "boxdL;": '\U00002555', + "boxdR;": '\U00002552', + "boxdl;": '\U00002510', + "boxdr;": '\U0000250C', + "boxh;": '\U00002500', + "boxhD;": '\U00002565', + "boxhU;": '\U00002568', + "boxhd;": '\U0000252C', + "boxhu;": '\U00002534', + "boxminus;": '\U0000229F', + "boxplus;": '\U0000229E', + "boxtimes;": '\U000022A0', + "boxuL;": '\U0000255B', + "boxuR;": '\U00002558', + "boxul;": '\U00002518', + "boxur;": '\U00002514', + "boxv;": '\U00002502', + "boxvH;": '\U0000256A', + "boxvL;": '\U00002561', + "boxvR;": '\U0000255E', + "boxvh;": '\U0000253C', + "boxvl;": '\U00002524', + "boxvr;": '\U0000251C', + "bprime;": '\U00002035', + "breve;": '\U000002D8', + "brvbar;": '\U000000A6', + "bscr;": '\U0001D4B7', + "bsemi;": '\U0000204F', + "bsim;": '\U0000223D', + "bsime;": '\U000022CD', + "bsol;": '\U0000005C', + "bsolb;": '\U000029C5', + "bsolhsub;": '\U000027C8', + "bull;": '\U00002022', + "bullet;": '\U00002022', + "bump;": '\U0000224E', + "bumpE;": '\U00002AAE', + "bumpe;": '\U0000224F', + "bumpeq;": '\U0000224F', + "cacute;": '\U00000107', + "cap;": '\U00002229', + "capand;": '\U00002A44', + "capbrcup;": '\U00002A49', + "capcap;": '\U00002A4B', + "capcup;": '\U00002A47', + "capdot;": '\U00002A40', + "caret;": '\U00002041', + "caron;": '\U000002C7', + "ccaps;": '\U00002A4D', + "ccaron;": '\U0000010D', + "ccedil;": '\U000000E7', + "ccirc;": '\U00000109', + "ccups;": '\U00002A4C', + "ccupssm;": '\U00002A50', + "cdot;": '\U0000010B', + "cedil;": '\U000000B8', + "cemptyv;": '\U000029B2', + "cent;": '\U000000A2', + "centerdot;": '\U000000B7', + "cfr;": '\U0001D520', + "chcy;": '\U00000447', + "check;": '\U00002713', + "checkmark;": '\U00002713', + "chi;": '\U000003C7', + "cir;": '\U000025CB', + "cirE;": '\U000029C3', + "circ;": '\U000002C6', + "circeq;": '\U00002257', + "circlearrowleft;": '\U000021BA', + "circlearrowright;": '\U000021BB', + "circledR;": '\U000000AE', + "circledS;": '\U000024C8', + "circledast;": '\U0000229B', + "circledcirc;": '\U0000229A', + "circleddash;": '\U0000229D', + "cire;": '\U00002257', + "cirfnint;": '\U00002A10', + "cirmid;": '\U00002AEF', + "cirscir;": '\U000029C2', + "clubs;": '\U00002663', + "clubsuit;": '\U00002663', + "colon;": '\U0000003A', + "colone;": '\U00002254', + "coloneq;": '\U00002254', + "comma;": '\U0000002C', + "commat;": '\U00000040', + "comp;": '\U00002201', + "compfn;": '\U00002218', + "complement;": '\U00002201', + "complexes;": '\U00002102', + "cong;": '\U00002245', + "congdot;": '\U00002A6D', + "conint;": '\U0000222E', + "copf;": '\U0001D554', + "coprod;": '\U00002210', + "copy;": '\U000000A9', + "copysr;": '\U00002117', + "crarr;": '\U000021B5', + "cross;": '\U00002717', + "cscr;": '\U0001D4B8', + "csub;": '\U00002ACF', + "csube;": '\U00002AD1', + "csup;": '\U00002AD0', + "csupe;": '\U00002AD2', + "ctdot;": '\U000022EF', + "cudarrl;": '\U00002938', + "cudarrr;": '\U00002935', + "cuepr;": '\U000022DE', + "cuesc;": '\U000022DF', + "cularr;": '\U000021B6', + "cularrp;": '\U0000293D', + "cup;": '\U0000222A', + "cupbrcap;": '\U00002A48', + "cupcap;": '\U00002A46', + "cupcup;": '\U00002A4A', + "cupdot;": '\U0000228D', + "cupor;": '\U00002A45', + "curarr;": '\U000021B7', + "curarrm;": '\U0000293C', + "curlyeqprec;": '\U000022DE', + "curlyeqsucc;": '\U000022DF', + "curlyvee;": '\U000022CE', + "curlywedge;": '\U000022CF', + "curren;": '\U000000A4', + "curvearrowleft;": '\U000021B6', + "curvearrowright;": '\U000021B7', + "cuvee;": '\U000022CE', + "cuwed;": '\U000022CF', + "cwconint;": '\U00002232', + "cwint;": '\U00002231', + "cylcty;": '\U0000232D', + "dArr;": '\U000021D3', + "dHar;": '\U00002965', + "dagger;": '\U00002020', + "daleth;": '\U00002138', + "darr;": '\U00002193', + "dash;": '\U00002010', + "dashv;": '\U000022A3', + "dbkarow;": '\U0000290F', + "dblac;": '\U000002DD', + "dcaron;": '\U0000010F', + "dcy;": '\U00000434', + "dd;": '\U00002146', + "ddagger;": '\U00002021', + "ddarr;": '\U000021CA', + "ddotseq;": '\U00002A77', + "deg;": '\U000000B0', + "delta;": '\U000003B4', + "demptyv;": '\U000029B1', + "dfisht;": '\U0000297F', + "dfr;": '\U0001D521', + "dharl;": '\U000021C3', + "dharr;": '\U000021C2', + "diam;": '\U000022C4', + "diamond;": '\U000022C4', + "diamondsuit;": '\U00002666', + "diams;": '\U00002666', + "die;": '\U000000A8', + "digamma;": '\U000003DD', + "disin;": '\U000022F2', + "div;": '\U000000F7', + "divide;": '\U000000F7', + "divideontimes;": '\U000022C7', + "divonx;": '\U000022C7', + "djcy;": '\U00000452', + "dlcorn;": '\U0000231E', + "dlcrop;": '\U0000230D', + "dollar;": '\U00000024', + "dopf;": '\U0001D555', + "dot;": '\U000002D9', + "doteq;": '\U00002250', + "doteqdot;": '\U00002251', + "dotminus;": '\U00002238', + "dotplus;": '\U00002214', + "dotsquare;": '\U000022A1', + "doublebarwedge;": '\U00002306', + "downarrow;": '\U00002193', + "downdownarrows;": '\U000021CA', + "downharpoonleft;": '\U000021C3', + "downharpoonright;": '\U000021C2', + "drbkarow;": '\U00002910', + "drcorn;": '\U0000231F', + "drcrop;": '\U0000230C', + "dscr;": '\U0001D4B9', + "dscy;": '\U00000455', + "dsol;": '\U000029F6', + "dstrok;": '\U00000111', + "dtdot;": '\U000022F1', + "dtri;": '\U000025BF', + "dtrif;": '\U000025BE', + "duarr;": '\U000021F5', + "duhar;": '\U0000296F', + "dwangle;": '\U000029A6', + "dzcy;": '\U0000045F', + "dzigrarr;": '\U000027FF', + "eDDot;": '\U00002A77', + "eDot;": '\U00002251', + "eacute;": '\U000000E9', + "easter;": '\U00002A6E', + "ecaron;": '\U0000011B', + "ecir;": '\U00002256', + "ecirc;": '\U000000EA', + "ecolon;": '\U00002255', + "ecy;": '\U0000044D', + "edot;": '\U00000117', + "ee;": '\U00002147', + "efDot;": '\U00002252', + "efr;": '\U0001D522', + "eg;": '\U00002A9A', + "egrave;": '\U000000E8', + "egs;": '\U00002A96', + "egsdot;": '\U00002A98', + "el;": '\U00002A99', + "elinters;": '\U000023E7', + "ell;": '\U00002113', + "els;": '\U00002A95', + "elsdot;": '\U00002A97', + "emacr;": '\U00000113', + "empty;": '\U00002205', + "emptyset;": '\U00002205', + "emptyv;": '\U00002205', + "emsp;": '\U00002003', + "emsp13;": '\U00002004', + "emsp14;": '\U00002005', + "eng;": '\U0000014B', + "ensp;": '\U00002002', + "eogon;": '\U00000119', + "eopf;": '\U0001D556', + "epar;": '\U000022D5', + "eparsl;": '\U000029E3', + "eplus;": '\U00002A71', + "epsi;": '\U000003B5', + "epsilon;": '\U000003B5', + "epsiv;": '\U000003F5', + "eqcirc;": '\U00002256', + "eqcolon;": '\U00002255', + "eqsim;": '\U00002242', + "eqslantgtr;": '\U00002A96', + "eqslantless;": '\U00002A95', + "equals;": '\U0000003D', + "equest;": '\U0000225F', + "equiv;": '\U00002261', + "equivDD;": '\U00002A78', + "eqvparsl;": '\U000029E5', + "erDot;": '\U00002253', + "erarr;": '\U00002971', + "escr;": '\U0000212F', + "esdot;": '\U00002250', + "esim;": '\U00002242', + "eta;": '\U000003B7', + "eth;": '\U000000F0', + "euml;": '\U000000EB', + "euro;": '\U000020AC', + "excl;": '\U00000021', + "exist;": '\U00002203', + "expectation;": '\U00002130', + "exponentiale;": '\U00002147', + "fallingdotseq;": '\U00002252', + "fcy;": '\U00000444', + "female;": '\U00002640', + "ffilig;": '\U0000FB03', + "fflig;": '\U0000FB00', + "ffllig;": '\U0000FB04', + "ffr;": '\U0001D523', + "filig;": '\U0000FB01', + "flat;": '\U0000266D', + "fllig;": '\U0000FB02', + "fltns;": '\U000025B1', + "fnof;": '\U00000192', + "fopf;": '\U0001D557', + "forall;": '\U00002200', + "fork;": '\U000022D4', + "forkv;": '\U00002AD9', + "fpartint;": '\U00002A0D', + "frac12;": '\U000000BD', + "frac13;": '\U00002153', + "frac14;": '\U000000BC', + "frac15;": '\U00002155', + "frac16;": '\U00002159', + "frac18;": '\U0000215B', + "frac23;": '\U00002154', + "frac25;": '\U00002156', + "frac34;": '\U000000BE', + "frac35;": '\U00002157', + "frac38;": '\U0000215C', + "frac45;": '\U00002158', + "frac56;": '\U0000215A', + "frac58;": '\U0000215D', + "frac78;": '\U0000215E', + "frasl;": '\U00002044', + "frown;": '\U00002322', + "fscr;": '\U0001D4BB', + "gE;": '\U00002267', + "gEl;": '\U00002A8C', + "gacute;": '\U000001F5', + "gamma;": '\U000003B3', + "gammad;": '\U000003DD', + "gap;": '\U00002A86', + "gbreve;": '\U0000011F', + "gcirc;": '\U0000011D', + "gcy;": '\U00000433', + "gdot;": '\U00000121', + "ge;": '\U00002265', + "gel;": '\U000022DB', + "geq;": '\U00002265', + "geqq;": '\U00002267', + "geqslant;": '\U00002A7E', + "ges;": '\U00002A7E', + "gescc;": '\U00002AA9', + "gesdot;": '\U00002A80', + "gesdoto;": '\U00002A82', + "gesdotol;": '\U00002A84', + "gesles;": '\U00002A94', + "gfr;": '\U0001D524', + "gg;": '\U0000226B', + "ggg;": '\U000022D9', + "gimel;": '\U00002137', + "gjcy;": '\U00000453', + "gl;": '\U00002277', + "glE;": '\U00002A92', + "gla;": '\U00002AA5', + "glj;": '\U00002AA4', + "gnE;": '\U00002269', + "gnap;": '\U00002A8A', + "gnapprox;": '\U00002A8A', + "gne;": '\U00002A88', + "gneq;": '\U00002A88', + "gneqq;": '\U00002269', + "gnsim;": '\U000022E7', + "gopf;": '\U0001D558', + "grave;": '\U00000060', + "gscr;": '\U0000210A', + "gsim;": '\U00002273', + "gsime;": '\U00002A8E', + "gsiml;": '\U00002A90', + "gt;": '\U0000003E', + "gtcc;": '\U00002AA7', + "gtcir;": '\U00002A7A', + "gtdot;": '\U000022D7', + "gtlPar;": '\U00002995', + "gtquest;": '\U00002A7C', + "gtrapprox;": '\U00002A86', + "gtrarr;": '\U00002978', + "gtrdot;": '\U000022D7', + "gtreqless;": '\U000022DB', + "gtreqqless;": '\U00002A8C', + "gtrless;": '\U00002277', + "gtrsim;": '\U00002273', + "hArr;": '\U000021D4', + "hairsp;": '\U0000200A', + "half;": '\U000000BD', + "hamilt;": '\U0000210B', + "hardcy;": '\U0000044A', + "harr;": '\U00002194', + "harrcir;": '\U00002948', + "harrw;": '\U000021AD', + "hbar;": '\U0000210F', + "hcirc;": '\U00000125', + "hearts;": '\U00002665', + "heartsuit;": '\U00002665', + "hellip;": '\U00002026', + "hercon;": '\U000022B9', + "hfr;": '\U0001D525', + "hksearow;": '\U00002925', + "hkswarow;": '\U00002926', + "hoarr;": '\U000021FF', + "homtht;": '\U0000223B', + "hookleftarrow;": '\U000021A9', + "hookrightarrow;": '\U000021AA', + "hopf;": '\U0001D559', + "horbar;": '\U00002015', + "hscr;": '\U0001D4BD', + "hslash;": '\U0000210F', + "hstrok;": '\U00000127', + "hybull;": '\U00002043', + "hyphen;": '\U00002010', + "iacute;": '\U000000ED', + "ic;": '\U00002063', + "icirc;": '\U000000EE', + "icy;": '\U00000438', + "iecy;": '\U00000435', + "iexcl;": '\U000000A1', + "iff;": '\U000021D4', + "ifr;": '\U0001D526', + "igrave;": '\U000000EC', + "ii;": '\U00002148', + "iiiint;": '\U00002A0C', + "iiint;": '\U0000222D', + "iinfin;": '\U000029DC', + "iiota;": '\U00002129', + "ijlig;": '\U00000133', + "imacr;": '\U0000012B', + "image;": '\U00002111', + "imagline;": '\U00002110', + "imagpart;": '\U00002111', + "imath;": '\U00000131', + "imof;": '\U000022B7', + "imped;": '\U000001B5', + "in;": '\U00002208', + "incare;": '\U00002105', + "infin;": '\U0000221E', + "infintie;": '\U000029DD', + "inodot;": '\U00000131', + "int;": '\U0000222B', + "intcal;": '\U000022BA', + "integers;": '\U00002124', + "intercal;": '\U000022BA', + "intlarhk;": '\U00002A17', + "intprod;": '\U00002A3C', + "iocy;": '\U00000451', + "iogon;": '\U0000012F', + "iopf;": '\U0001D55A', + "iota;": '\U000003B9', + "iprod;": '\U00002A3C', + "iquest;": '\U000000BF', + "iscr;": '\U0001D4BE', + "isin;": '\U00002208', + "isinE;": '\U000022F9', + "isindot;": '\U000022F5', + "isins;": '\U000022F4', + "isinsv;": '\U000022F3', + "isinv;": '\U00002208', + "it;": '\U00002062', + "itilde;": '\U00000129', + "iukcy;": '\U00000456', + "iuml;": '\U000000EF', + "jcirc;": '\U00000135', + "jcy;": '\U00000439', + "jfr;": '\U0001D527', + "jmath;": '\U00000237', + "jopf;": '\U0001D55B', + "jscr;": '\U0001D4BF', + "jsercy;": '\U00000458', + "jukcy;": '\U00000454', + "kappa;": '\U000003BA', + "kappav;": '\U000003F0', + "kcedil;": '\U00000137', + "kcy;": '\U0000043A', + "kfr;": '\U0001D528', + "kgreen;": '\U00000138', + "khcy;": '\U00000445', + "kjcy;": '\U0000045C', + "kopf;": '\U0001D55C', + "kscr;": '\U0001D4C0', + "lAarr;": '\U000021DA', + "lArr;": '\U000021D0', + "lAtail;": '\U0000291B', + "lBarr;": '\U0000290E', + "lE;": '\U00002266', + "lEg;": '\U00002A8B', + "lHar;": '\U00002962', + "lacute;": '\U0000013A', + "laemptyv;": '\U000029B4', + "lagran;": '\U00002112', + "lambda;": '\U000003BB', + "lang;": '\U000027E8', + "langd;": '\U00002991', + "langle;": '\U000027E8', + "lap;": '\U00002A85', + "laquo;": '\U000000AB', + "larr;": '\U00002190', + "larrb;": '\U000021E4', + "larrbfs;": '\U0000291F', + "larrfs;": '\U0000291D', + "larrhk;": '\U000021A9', + "larrlp;": '\U000021AB', + "larrpl;": '\U00002939', + "larrsim;": '\U00002973', + "larrtl;": '\U000021A2', + "lat;": '\U00002AAB', + "latail;": '\U00002919', + "late;": '\U00002AAD', + "lbarr;": '\U0000290C', + "lbbrk;": '\U00002772', + "lbrace;": '\U0000007B', + "lbrack;": '\U0000005B', + "lbrke;": '\U0000298B', + "lbrksld;": '\U0000298F', + "lbrkslu;": '\U0000298D', + "lcaron;": '\U0000013E', + "lcedil;": '\U0000013C', + "lceil;": '\U00002308', + "lcub;": '\U0000007B', + "lcy;": '\U0000043B', + "ldca;": '\U00002936', + "ldquo;": '\U0000201C', + "ldquor;": '\U0000201E', + "ldrdhar;": '\U00002967', + "ldrushar;": '\U0000294B', + "ldsh;": '\U000021B2', + "le;": '\U00002264', + "leftarrow;": '\U00002190', + "leftarrowtail;": '\U000021A2', + "leftharpoondown;": '\U000021BD', + "leftharpoonup;": '\U000021BC', + "leftleftarrows;": '\U000021C7', + "leftrightarrow;": '\U00002194', + "leftrightarrows;": '\U000021C6', + "leftrightharpoons;": '\U000021CB', + "leftrightsquigarrow;": '\U000021AD', + "leftthreetimes;": '\U000022CB', + "leg;": '\U000022DA', + "leq;": '\U00002264', + "leqq;": '\U00002266', + "leqslant;": '\U00002A7D', + "les;": '\U00002A7D', + "lescc;": '\U00002AA8', + "lesdot;": '\U00002A7F', + "lesdoto;": '\U00002A81', + "lesdotor;": '\U00002A83', + "lesges;": '\U00002A93', + "lessapprox;": '\U00002A85', + "lessdot;": '\U000022D6', + "lesseqgtr;": '\U000022DA', + "lesseqqgtr;": '\U00002A8B', + "lessgtr;": '\U00002276', + "lesssim;": '\U00002272', + "lfisht;": '\U0000297C', + "lfloor;": '\U0000230A', + "lfr;": '\U0001D529', + "lg;": '\U00002276', + "lgE;": '\U00002A91', + "lhard;": '\U000021BD', + "lharu;": '\U000021BC', + "lharul;": '\U0000296A', + "lhblk;": '\U00002584', + "ljcy;": '\U00000459', + "ll;": '\U0000226A', + "llarr;": '\U000021C7', + "llcorner;": '\U0000231E', + "llhard;": '\U0000296B', + "lltri;": '\U000025FA', + "lmidot;": '\U00000140', + "lmoust;": '\U000023B0', + "lmoustache;": '\U000023B0', + "lnE;": '\U00002268', + "lnap;": '\U00002A89', + "lnapprox;": '\U00002A89', + "lne;": '\U00002A87', + "lneq;": '\U00002A87', + "lneqq;": '\U00002268', + "lnsim;": '\U000022E6', + "loang;": '\U000027EC', + "loarr;": '\U000021FD', + "lobrk;": '\U000027E6', + "longleftarrow;": '\U000027F5', + "longleftrightarrow;": '\U000027F7', + "longmapsto;": '\U000027FC', + "longrightarrow;": '\U000027F6', + "looparrowleft;": '\U000021AB', + "looparrowright;": '\U000021AC', + "lopar;": '\U00002985', + "lopf;": '\U0001D55D', + "loplus;": '\U00002A2D', + "lotimes;": '\U00002A34', + "lowast;": '\U00002217', + "lowbar;": '\U0000005F', + "loz;": '\U000025CA', + "lozenge;": '\U000025CA', + "lozf;": '\U000029EB', + "lpar;": '\U00000028', + "lparlt;": '\U00002993', + "lrarr;": '\U000021C6', + "lrcorner;": '\U0000231F', + "lrhar;": '\U000021CB', + "lrhard;": '\U0000296D', + "lrm;": '\U0000200E', + "lrtri;": '\U000022BF', + "lsaquo;": '\U00002039', + "lscr;": '\U0001D4C1', + "lsh;": '\U000021B0', + "lsim;": '\U00002272', + "lsime;": '\U00002A8D', + "lsimg;": '\U00002A8F', + "lsqb;": '\U0000005B', + "lsquo;": '\U00002018', + "lsquor;": '\U0000201A', + "lstrok;": '\U00000142', + "lt;": '\U0000003C', + "ltcc;": '\U00002AA6', + "ltcir;": '\U00002A79', + "ltdot;": '\U000022D6', + "lthree;": '\U000022CB', + "ltimes;": '\U000022C9', + "ltlarr;": '\U00002976', + "ltquest;": '\U00002A7B', + "ltrPar;": '\U00002996', + "ltri;": '\U000025C3', + "ltrie;": '\U000022B4', + "ltrif;": '\U000025C2', + "lurdshar;": '\U0000294A', + "luruhar;": '\U00002966', + "mDDot;": '\U0000223A', + "macr;": '\U000000AF', + "male;": '\U00002642', + "malt;": '\U00002720', + "maltese;": '\U00002720', + "map;": '\U000021A6', + "mapsto;": '\U000021A6', + "mapstodown;": '\U000021A7', + "mapstoleft;": '\U000021A4', + "mapstoup;": '\U000021A5', + "marker;": '\U000025AE', + "mcomma;": '\U00002A29', + "mcy;": '\U0000043C', + "mdash;": '\U00002014', + "measuredangle;": '\U00002221', + "mfr;": '\U0001D52A', + "mho;": '\U00002127', + "micro;": '\U000000B5', + "mid;": '\U00002223', + "midast;": '\U0000002A', + "midcir;": '\U00002AF0', + "middot;": '\U000000B7', + "minus;": '\U00002212', + "minusb;": '\U0000229F', + "minusd;": '\U00002238', + "minusdu;": '\U00002A2A', + "mlcp;": '\U00002ADB', + "mldr;": '\U00002026', + "mnplus;": '\U00002213', + "models;": '\U000022A7', + "mopf;": '\U0001D55E', + "mp;": '\U00002213', + "mscr;": '\U0001D4C2', + "mstpos;": '\U0000223E', + "mu;": '\U000003BC', + "multimap;": '\U000022B8', + "mumap;": '\U000022B8', + "nLeftarrow;": '\U000021CD', + "nLeftrightarrow;": '\U000021CE', + "nRightarrow;": '\U000021CF', + "nVDash;": '\U000022AF', + "nVdash;": '\U000022AE', + "nabla;": '\U00002207', + "nacute;": '\U00000144', + "nap;": '\U00002249', + "napos;": '\U00000149', + "napprox;": '\U00002249', + "natur;": '\U0000266E', + "natural;": '\U0000266E', + "naturals;": '\U00002115', + "nbsp;": '\U000000A0', + "ncap;": '\U00002A43', + "ncaron;": '\U00000148', + "ncedil;": '\U00000146', + "ncong;": '\U00002247', + "ncup;": '\U00002A42', + "ncy;": '\U0000043D', + "ndash;": '\U00002013', + "ne;": '\U00002260', + "neArr;": '\U000021D7', + "nearhk;": '\U00002924', + "nearr;": '\U00002197', + "nearrow;": '\U00002197', + "nequiv;": '\U00002262', + "nesear;": '\U00002928', + "nexist;": '\U00002204', + "nexists;": '\U00002204', + "nfr;": '\U0001D52B', + "nge;": '\U00002271', + "ngeq;": '\U00002271', + "ngsim;": '\U00002275', + "ngt;": '\U0000226F', + "ngtr;": '\U0000226F', + "nhArr;": '\U000021CE', + "nharr;": '\U000021AE', + "nhpar;": '\U00002AF2', + "ni;": '\U0000220B', + "nis;": '\U000022FC', + "nisd;": '\U000022FA', + "niv;": '\U0000220B', + "njcy;": '\U0000045A', + "nlArr;": '\U000021CD', + "nlarr;": '\U0000219A', + "nldr;": '\U00002025', + "nle;": '\U00002270', + "nleftarrow;": '\U0000219A', + "nleftrightarrow;": '\U000021AE', + "nleq;": '\U00002270', + "nless;": '\U0000226E', + "nlsim;": '\U00002274', + "nlt;": '\U0000226E', + "nltri;": '\U000022EA', + "nltrie;": '\U000022EC', + "nmid;": '\U00002224', + "nopf;": '\U0001D55F', + "not;": '\U000000AC', + "notin;": '\U00002209', + "notinva;": '\U00002209', + "notinvb;": '\U000022F7', + "notinvc;": '\U000022F6', + "notni;": '\U0000220C', + "notniva;": '\U0000220C', + "notnivb;": '\U000022FE', + "notnivc;": '\U000022FD', + "npar;": '\U00002226', + "nparallel;": '\U00002226', + "npolint;": '\U00002A14', + "npr;": '\U00002280', + "nprcue;": '\U000022E0', + "nprec;": '\U00002280', + "nrArr;": '\U000021CF', + "nrarr;": '\U0000219B', + "nrightarrow;": '\U0000219B', + "nrtri;": '\U000022EB', + "nrtrie;": '\U000022ED', + "nsc;": '\U00002281', + "nsccue;": '\U000022E1', + "nscr;": '\U0001D4C3', + "nshortmid;": '\U00002224', + "nshortparallel;": '\U00002226', + "nsim;": '\U00002241', + "nsime;": '\U00002244', + "nsimeq;": '\U00002244', + "nsmid;": '\U00002224', + "nspar;": '\U00002226', + "nsqsube;": '\U000022E2', + "nsqsupe;": '\U000022E3', + "nsub;": '\U00002284', + "nsube;": '\U00002288', + "nsubseteq;": '\U00002288', + "nsucc;": '\U00002281', + "nsup;": '\U00002285', + "nsupe;": '\U00002289', + "nsupseteq;": '\U00002289', + "ntgl;": '\U00002279', + "ntilde;": '\U000000F1', + "ntlg;": '\U00002278', + "ntriangleleft;": '\U000022EA', + "ntrianglelefteq;": '\U000022EC', + "ntriangleright;": '\U000022EB', + "ntrianglerighteq;": '\U000022ED', + "nu;": '\U000003BD', + "num;": '\U00000023', + "numero;": '\U00002116', + "numsp;": '\U00002007', + "nvDash;": '\U000022AD', + "nvHarr;": '\U00002904', + "nvdash;": '\U000022AC', + "nvinfin;": '\U000029DE', + "nvlArr;": '\U00002902', + "nvrArr;": '\U00002903', + "nwArr;": '\U000021D6', + "nwarhk;": '\U00002923', + "nwarr;": '\U00002196', + "nwarrow;": '\U00002196', + "nwnear;": '\U00002927', + "oS;": '\U000024C8', + "oacute;": '\U000000F3', + "oast;": '\U0000229B', + "ocir;": '\U0000229A', + "ocirc;": '\U000000F4', + "ocy;": '\U0000043E', + "odash;": '\U0000229D', + "odblac;": '\U00000151', + "odiv;": '\U00002A38', + "odot;": '\U00002299', + "odsold;": '\U000029BC', + "oelig;": '\U00000153', + "ofcir;": '\U000029BF', + "ofr;": '\U0001D52C', + "ogon;": '\U000002DB', + "ograve;": '\U000000F2', + "ogt;": '\U000029C1', + "ohbar;": '\U000029B5', + "ohm;": '\U000003A9', + "oint;": '\U0000222E', + "olarr;": '\U000021BA', + "olcir;": '\U000029BE', + "olcross;": '\U000029BB', + "oline;": '\U0000203E', + "olt;": '\U000029C0', + "omacr;": '\U0000014D', + "omega;": '\U000003C9', + "omicron;": '\U000003BF', + "omid;": '\U000029B6', + "ominus;": '\U00002296', + "oopf;": '\U0001D560', + "opar;": '\U000029B7', + "operp;": '\U000029B9', + "oplus;": '\U00002295', + "or;": '\U00002228', + "orarr;": '\U000021BB', + "ord;": '\U00002A5D', + "order;": '\U00002134', + "orderof;": '\U00002134', + "ordf;": '\U000000AA', + "ordm;": '\U000000BA', + "origof;": '\U000022B6', + "oror;": '\U00002A56', + "orslope;": '\U00002A57', + "orv;": '\U00002A5B', + "oscr;": '\U00002134', + "oslash;": '\U000000F8', + "osol;": '\U00002298', + "otilde;": '\U000000F5', + "otimes;": '\U00002297', + "otimesas;": '\U00002A36', + "ouml;": '\U000000F6', + "ovbar;": '\U0000233D', + "par;": '\U00002225', + "para;": '\U000000B6', + "parallel;": '\U00002225', + "parsim;": '\U00002AF3', + "parsl;": '\U00002AFD', + "part;": '\U00002202', + "pcy;": '\U0000043F', + "percnt;": '\U00000025', + "period;": '\U0000002E', + "permil;": '\U00002030', + "perp;": '\U000022A5', + "pertenk;": '\U00002031', + "pfr;": '\U0001D52D', + "phi;": '\U000003C6', + "phiv;": '\U000003D5', + "phmmat;": '\U00002133', + "phone;": '\U0000260E', + "pi;": '\U000003C0', + "pitchfork;": '\U000022D4', + "piv;": '\U000003D6', + "planck;": '\U0000210F', + "planckh;": '\U0000210E', + "plankv;": '\U0000210F', + "plus;": '\U0000002B', + "plusacir;": '\U00002A23', + "plusb;": '\U0000229E', + "pluscir;": '\U00002A22', + "plusdo;": '\U00002214', + "plusdu;": '\U00002A25', + "pluse;": '\U00002A72', + "plusmn;": '\U000000B1', + "plussim;": '\U00002A26', + "plustwo;": '\U00002A27', + "pm;": '\U000000B1', + "pointint;": '\U00002A15', + "popf;": '\U0001D561', + "pound;": '\U000000A3', + "pr;": '\U0000227A', + "prE;": '\U00002AB3', + "prap;": '\U00002AB7', + "prcue;": '\U0000227C', + "pre;": '\U00002AAF', + "prec;": '\U0000227A', + "precapprox;": '\U00002AB7', + "preccurlyeq;": '\U0000227C', + "preceq;": '\U00002AAF', + "precnapprox;": '\U00002AB9', + "precneqq;": '\U00002AB5', + "precnsim;": '\U000022E8', + "precsim;": '\U0000227E', + "prime;": '\U00002032', + "primes;": '\U00002119', + "prnE;": '\U00002AB5', + "prnap;": '\U00002AB9', + "prnsim;": '\U000022E8', + "prod;": '\U0000220F', + "profalar;": '\U0000232E', + "profline;": '\U00002312', + "profsurf;": '\U00002313', + "prop;": '\U0000221D', + "propto;": '\U0000221D', + "prsim;": '\U0000227E', + "prurel;": '\U000022B0', + "pscr;": '\U0001D4C5', + "psi;": '\U000003C8', + "puncsp;": '\U00002008', + "qfr;": '\U0001D52E', + "qint;": '\U00002A0C', + "qopf;": '\U0001D562', + "qprime;": '\U00002057', + "qscr;": '\U0001D4C6', + "quaternions;": '\U0000210D', + "quatint;": '\U00002A16', + "quest;": '\U0000003F', + "questeq;": '\U0000225F', + "quot;": '\U00000022', + "rAarr;": '\U000021DB', + "rArr;": '\U000021D2', + "rAtail;": '\U0000291C', + "rBarr;": '\U0000290F', + "rHar;": '\U00002964', + "racute;": '\U00000155', + "radic;": '\U0000221A', + "raemptyv;": '\U000029B3', + "rang;": '\U000027E9', + "rangd;": '\U00002992', + "range;": '\U000029A5', + "rangle;": '\U000027E9', + "raquo;": '\U000000BB', + "rarr;": '\U00002192', + "rarrap;": '\U00002975', + "rarrb;": '\U000021E5', + "rarrbfs;": '\U00002920', + "rarrc;": '\U00002933', + "rarrfs;": '\U0000291E', + "rarrhk;": '\U000021AA', + "rarrlp;": '\U000021AC', + "rarrpl;": '\U00002945', + "rarrsim;": '\U00002974', + "rarrtl;": '\U000021A3', + "rarrw;": '\U0000219D', + "ratail;": '\U0000291A', + "ratio;": '\U00002236', + "rationals;": '\U0000211A', + "rbarr;": '\U0000290D', + "rbbrk;": '\U00002773', + "rbrace;": '\U0000007D', + "rbrack;": '\U0000005D', + "rbrke;": '\U0000298C', + "rbrksld;": '\U0000298E', + "rbrkslu;": '\U00002990', + "rcaron;": '\U00000159', + "rcedil;": '\U00000157', + "rceil;": '\U00002309', + "rcub;": '\U0000007D', + "rcy;": '\U00000440', + "rdca;": '\U00002937', + "rdldhar;": '\U00002969', + "rdquo;": '\U0000201D', + "rdquor;": '\U0000201D', + "rdsh;": '\U000021B3', + "real;": '\U0000211C', + "realine;": '\U0000211B', + "realpart;": '\U0000211C', + "reals;": '\U0000211D', + "rect;": '\U000025AD', + "reg;": '\U000000AE', + "rfisht;": '\U0000297D', + "rfloor;": '\U0000230B', + "rfr;": '\U0001D52F', + "rhard;": '\U000021C1', + "rharu;": '\U000021C0', + "rharul;": '\U0000296C', + "rho;": '\U000003C1', + "rhov;": '\U000003F1', + "rightarrow;": '\U00002192', + "rightarrowtail;": '\U000021A3', + "rightharpoondown;": '\U000021C1', + "rightharpoonup;": '\U000021C0', + "rightleftarrows;": '\U000021C4', + "rightleftharpoons;": '\U000021CC', + "rightrightarrows;": '\U000021C9', + "rightsquigarrow;": '\U0000219D', + "rightthreetimes;": '\U000022CC', + "ring;": '\U000002DA', + "risingdotseq;": '\U00002253', + "rlarr;": '\U000021C4', + "rlhar;": '\U000021CC', + "rlm;": '\U0000200F', + "rmoust;": '\U000023B1', + "rmoustache;": '\U000023B1', + "rnmid;": '\U00002AEE', + "roang;": '\U000027ED', + "roarr;": '\U000021FE', + "robrk;": '\U000027E7', + "ropar;": '\U00002986', + "ropf;": '\U0001D563', + "roplus;": '\U00002A2E', + "rotimes;": '\U00002A35', + "rpar;": '\U00000029', + "rpargt;": '\U00002994', + "rppolint;": '\U00002A12', + "rrarr;": '\U000021C9', + "rsaquo;": '\U0000203A', + "rscr;": '\U0001D4C7', + "rsh;": '\U000021B1', + "rsqb;": '\U0000005D', + "rsquo;": '\U00002019', + "rsquor;": '\U00002019', + "rthree;": '\U000022CC', + "rtimes;": '\U000022CA', + "rtri;": '\U000025B9', + "rtrie;": '\U000022B5', + "rtrif;": '\U000025B8', + "rtriltri;": '\U000029CE', + "ruluhar;": '\U00002968', + "rx;": '\U0000211E', + "sacute;": '\U0000015B', + "sbquo;": '\U0000201A', + "sc;": '\U0000227B', + "scE;": '\U00002AB4', + "scap;": '\U00002AB8', + "scaron;": '\U00000161', + "sccue;": '\U0000227D', + "sce;": '\U00002AB0', + "scedil;": '\U0000015F', + "scirc;": '\U0000015D', + "scnE;": '\U00002AB6', + "scnap;": '\U00002ABA', + "scnsim;": '\U000022E9', + "scpolint;": '\U00002A13', + "scsim;": '\U0000227F', + "scy;": '\U00000441', + "sdot;": '\U000022C5', + "sdotb;": '\U000022A1', + "sdote;": '\U00002A66', + "seArr;": '\U000021D8', + "searhk;": '\U00002925', + "searr;": '\U00002198', + "searrow;": '\U00002198', + "sect;": '\U000000A7', + "semi;": '\U0000003B', + "seswar;": '\U00002929', + "setminus;": '\U00002216', + "setmn;": '\U00002216', + "sext;": '\U00002736', + "sfr;": '\U0001D530', + "sfrown;": '\U00002322', + "sharp;": '\U0000266F', + "shchcy;": '\U00000449', + "shcy;": '\U00000448', + "shortmid;": '\U00002223', + "shortparallel;": '\U00002225', + "shy;": '\U000000AD', + "sigma;": '\U000003C3', + "sigmaf;": '\U000003C2', + "sigmav;": '\U000003C2', + "sim;": '\U0000223C', + "simdot;": '\U00002A6A', + "sime;": '\U00002243', + "simeq;": '\U00002243', + "simg;": '\U00002A9E', + "simgE;": '\U00002AA0', + "siml;": '\U00002A9D', + "simlE;": '\U00002A9F', + "simne;": '\U00002246', + "simplus;": '\U00002A24', + "simrarr;": '\U00002972', + "slarr;": '\U00002190', + "smallsetminus;": '\U00002216', + "smashp;": '\U00002A33', + "smeparsl;": '\U000029E4', + "smid;": '\U00002223', + "smile;": '\U00002323', + "smt;": '\U00002AAA', + "smte;": '\U00002AAC', + "softcy;": '\U0000044C', + "sol;": '\U0000002F', + "solb;": '\U000029C4', + "solbar;": '\U0000233F', + "sopf;": '\U0001D564', + "spades;": '\U00002660', + "spadesuit;": '\U00002660', + "spar;": '\U00002225', + "sqcap;": '\U00002293', + "sqcup;": '\U00002294', + "sqsub;": '\U0000228F', + "sqsube;": '\U00002291', + "sqsubset;": '\U0000228F', + "sqsubseteq;": '\U00002291', + "sqsup;": '\U00002290', + "sqsupe;": '\U00002292', + "sqsupset;": '\U00002290', + "sqsupseteq;": '\U00002292', + "squ;": '\U000025A1', + "square;": '\U000025A1', + "squarf;": '\U000025AA', + "squf;": '\U000025AA', + "srarr;": '\U00002192', + "sscr;": '\U0001D4C8', + "ssetmn;": '\U00002216', + "ssmile;": '\U00002323', + "sstarf;": '\U000022C6', + "star;": '\U00002606', + "starf;": '\U00002605', + "straightepsilon;": '\U000003F5', + "straightphi;": '\U000003D5', + "strns;": '\U000000AF', + "sub;": '\U00002282', + "subE;": '\U00002AC5', + "subdot;": '\U00002ABD', + "sube;": '\U00002286', + "subedot;": '\U00002AC3', + "submult;": '\U00002AC1', + "subnE;": '\U00002ACB', + "subne;": '\U0000228A', + "subplus;": '\U00002ABF', + "subrarr;": '\U00002979', + "subset;": '\U00002282', + "subseteq;": '\U00002286', + "subseteqq;": '\U00002AC5', + "subsetneq;": '\U0000228A', + "subsetneqq;": '\U00002ACB', + "subsim;": '\U00002AC7', + "subsub;": '\U00002AD5', + "subsup;": '\U00002AD3', + "succ;": '\U0000227B', + "succapprox;": '\U00002AB8', + "succcurlyeq;": '\U0000227D', + "succeq;": '\U00002AB0', + "succnapprox;": '\U00002ABA', + "succneqq;": '\U00002AB6', + "succnsim;": '\U000022E9', + "succsim;": '\U0000227F', + "sum;": '\U00002211', + "sung;": '\U0000266A', + "sup;": '\U00002283', + "sup1;": '\U000000B9', + "sup2;": '\U000000B2', + "sup3;": '\U000000B3', + "supE;": '\U00002AC6', + "supdot;": '\U00002ABE', + "supdsub;": '\U00002AD8', + "supe;": '\U00002287', + "supedot;": '\U00002AC4', + "suphsol;": '\U000027C9', + "suphsub;": '\U00002AD7', + "suplarr;": '\U0000297B', + "supmult;": '\U00002AC2', + "supnE;": '\U00002ACC', + "supne;": '\U0000228B', + "supplus;": '\U00002AC0', + "supset;": '\U00002283', + "supseteq;": '\U00002287', + "supseteqq;": '\U00002AC6', + "supsetneq;": '\U0000228B', + "supsetneqq;": '\U00002ACC', + "supsim;": '\U00002AC8', + "supsub;": '\U00002AD4', + "supsup;": '\U00002AD6', + "swArr;": '\U000021D9', + "swarhk;": '\U00002926', + "swarr;": '\U00002199', + "swarrow;": '\U00002199', + "swnwar;": '\U0000292A', + "szlig;": '\U000000DF', + "target;": '\U00002316', + "tau;": '\U000003C4', + "tbrk;": '\U000023B4', + "tcaron;": '\U00000165', + "tcedil;": '\U00000163', + "tcy;": '\U00000442', + "tdot;": '\U000020DB', + "telrec;": '\U00002315', + "tfr;": '\U0001D531', + "there4;": '\U00002234', + "therefore;": '\U00002234', + "theta;": '\U000003B8', + "thetasym;": '\U000003D1', + "thetav;": '\U000003D1', + "thickapprox;": '\U00002248', + "thicksim;": '\U0000223C', + "thinsp;": '\U00002009', + "thkap;": '\U00002248', + "thksim;": '\U0000223C', + "thorn;": '\U000000FE', + "tilde;": '\U000002DC', + "times;": '\U000000D7', + "timesb;": '\U000022A0', + "timesbar;": '\U00002A31', + "timesd;": '\U00002A30', + "tint;": '\U0000222D', + "toea;": '\U00002928', + "top;": '\U000022A4', + "topbot;": '\U00002336', + "topcir;": '\U00002AF1', + "topf;": '\U0001D565', + "topfork;": '\U00002ADA', + "tosa;": '\U00002929', + "tprime;": '\U00002034', + "trade;": '\U00002122', + "triangle;": '\U000025B5', + "triangledown;": '\U000025BF', + "triangleleft;": '\U000025C3', + "trianglelefteq;": '\U000022B4', + "triangleq;": '\U0000225C', + "triangleright;": '\U000025B9', + "trianglerighteq;": '\U000022B5', + "tridot;": '\U000025EC', + "trie;": '\U0000225C', + "triminus;": '\U00002A3A', + "triplus;": '\U00002A39', + "trisb;": '\U000029CD', + "tritime;": '\U00002A3B', + "trpezium;": '\U000023E2', + "tscr;": '\U0001D4C9', + "tscy;": '\U00000446', + "tshcy;": '\U0000045B', + "tstrok;": '\U00000167', + "twixt;": '\U0000226C', + "twoheadleftarrow;": '\U0000219E', + "twoheadrightarrow;": '\U000021A0', + "uArr;": '\U000021D1', + "uHar;": '\U00002963', + "uacute;": '\U000000FA', + "uarr;": '\U00002191', + "ubrcy;": '\U0000045E', + "ubreve;": '\U0000016D', + "ucirc;": '\U000000FB', + "ucy;": '\U00000443', + "udarr;": '\U000021C5', + "udblac;": '\U00000171', + "udhar;": '\U0000296E', + "ufisht;": '\U0000297E', + "ufr;": '\U0001D532', + "ugrave;": '\U000000F9', + "uharl;": '\U000021BF', + "uharr;": '\U000021BE', + "uhblk;": '\U00002580', + "ulcorn;": '\U0000231C', + "ulcorner;": '\U0000231C', + "ulcrop;": '\U0000230F', + "ultri;": '\U000025F8', + "umacr;": '\U0000016B', + "uml;": '\U000000A8', + "uogon;": '\U00000173', + "uopf;": '\U0001D566', + "uparrow;": '\U00002191', + "updownarrow;": '\U00002195', + "upharpoonleft;": '\U000021BF', + "upharpoonright;": '\U000021BE', + "uplus;": '\U0000228E', + "upsi;": '\U000003C5', + "upsih;": '\U000003D2', + "upsilon;": '\U000003C5', + "upuparrows;": '\U000021C8', + "urcorn;": '\U0000231D', + "urcorner;": '\U0000231D', + "urcrop;": '\U0000230E', + "uring;": '\U0000016F', + "urtri;": '\U000025F9', + "uscr;": '\U0001D4CA', + "utdot;": '\U000022F0', + "utilde;": '\U00000169', + "utri;": '\U000025B5', + "utrif;": '\U000025B4', + "uuarr;": '\U000021C8', + "uuml;": '\U000000FC', + "uwangle;": '\U000029A7', + "vArr;": '\U000021D5', + "vBar;": '\U00002AE8', + "vBarv;": '\U00002AE9', + "vDash;": '\U000022A8', + "vangrt;": '\U0000299C', + "varepsilon;": '\U000003F5', + "varkappa;": '\U000003F0', + "varnothing;": '\U00002205', + "varphi;": '\U000003D5', + "varpi;": '\U000003D6', + "varpropto;": '\U0000221D', + "varr;": '\U00002195', + "varrho;": '\U000003F1', + "varsigma;": '\U000003C2', + "vartheta;": '\U000003D1', + "vartriangleleft;": '\U000022B2', + "vartriangleright;": '\U000022B3', + "vcy;": '\U00000432', + "vdash;": '\U000022A2', + "vee;": '\U00002228', + "veebar;": '\U000022BB', + "veeeq;": '\U0000225A', + "vellip;": '\U000022EE', + "verbar;": '\U0000007C', + "vert;": '\U0000007C', + "vfr;": '\U0001D533', + "vltri;": '\U000022B2', + "vopf;": '\U0001D567', + "vprop;": '\U0000221D', + "vrtri;": '\U000022B3', + "vscr;": '\U0001D4CB', + "vzigzag;": '\U0000299A', + "wcirc;": '\U00000175', + "wedbar;": '\U00002A5F', + "wedge;": '\U00002227', + "wedgeq;": '\U00002259', + "weierp;": '\U00002118', + "wfr;": '\U0001D534', + "wopf;": '\U0001D568', + "wp;": '\U00002118', + "wr;": '\U00002240', + "wreath;": '\U00002240', + "wscr;": '\U0001D4CC', + "xcap;": '\U000022C2', + "xcirc;": '\U000025EF', + "xcup;": '\U000022C3', + "xdtri;": '\U000025BD', + "xfr;": '\U0001D535', + "xhArr;": '\U000027FA', + "xharr;": '\U000027F7', + "xi;": '\U000003BE', + "xlArr;": '\U000027F8', + "xlarr;": '\U000027F5', + "xmap;": '\U000027FC', + "xnis;": '\U000022FB', + "xodot;": '\U00002A00', + "xopf;": '\U0001D569', + "xoplus;": '\U00002A01', + "xotime;": '\U00002A02', + "xrArr;": '\U000027F9', + "xrarr;": '\U000027F6', + "xscr;": '\U0001D4CD', + "xsqcup;": '\U00002A06', + "xuplus;": '\U00002A04', + "xutri;": '\U000025B3', + "xvee;": '\U000022C1', + "xwedge;": '\U000022C0', + "yacute;": '\U000000FD', + "yacy;": '\U0000044F', + "ycirc;": '\U00000177', + "ycy;": '\U0000044B', + "yen;": '\U000000A5', + "yfr;": '\U0001D536', + "yicy;": '\U00000457', + "yopf;": '\U0001D56A', + "yscr;": '\U0001D4CE', + "yucy;": '\U0000044E', + "yuml;": '\U000000FF', + "zacute;": '\U0000017A', + "zcaron;": '\U0000017E', + "zcy;": '\U00000437', + "zdot;": '\U0000017C', + "zeetrf;": '\U00002128', + "zeta;": '\U000003B6', + "zfr;": '\U0001D537', + "zhcy;": '\U00000436', + "zigrarr;": '\U000021DD', + "zopf;": '\U0001D56B', + "zscr;": '\U0001D4CF', + "zwj;": '\U0000200D', + "zwnj;": '\U0000200C', + "AElig": '\U000000C6', + "AMP": '\U00000026', + "Aacute": '\U000000C1', + "Acirc": '\U000000C2', + "Agrave": '\U000000C0', + "Aring": '\U000000C5', + "Atilde": '\U000000C3', + "Auml": '\U000000C4', + "COPY": '\U000000A9', + "Ccedil": '\U000000C7', + "ETH": '\U000000D0', + "Eacute": '\U000000C9', + "Ecirc": '\U000000CA', + "Egrave": '\U000000C8', + "Euml": '\U000000CB', + "GT": '\U0000003E', + "Iacute": '\U000000CD', + "Icirc": '\U000000CE', + "Igrave": '\U000000CC', + "Iuml": '\U000000CF', + "LT": '\U0000003C', + "Ntilde": '\U000000D1', + "Oacute": '\U000000D3', + "Ocirc": '\U000000D4', + "Ograve": '\U000000D2', + "Oslash": '\U000000D8', + "Otilde": '\U000000D5', + "Ouml": '\U000000D6', + "QUOT": '\U00000022', + "REG": '\U000000AE', + "THORN": '\U000000DE', + "Uacute": '\U000000DA', + "Ucirc": '\U000000DB', + "Ugrave": '\U000000D9', + "Uuml": '\U000000DC', + "Yacute": '\U000000DD', + "aacute": '\U000000E1', + "acirc": '\U000000E2', + "acute": '\U000000B4', + "aelig": '\U000000E6', + "agrave": '\U000000E0', + "amp": '\U00000026', + "aring": '\U000000E5', + "atilde": '\U000000E3', + "auml": '\U000000E4', + "brvbar": '\U000000A6', + "ccedil": '\U000000E7', + "cedil": '\U000000B8', + "cent": '\U000000A2', + "copy": '\U000000A9', + "curren": '\U000000A4', + "deg": '\U000000B0', + "divide": '\U000000F7', + "eacute": '\U000000E9', + "ecirc": '\U000000EA', + "egrave": '\U000000E8', + "eth": '\U000000F0', + "euml": '\U000000EB', + "frac12": '\U000000BD', + "frac14": '\U000000BC', + "frac34": '\U000000BE', + "gt": '\U0000003E', + "iacute": '\U000000ED', + "icirc": '\U000000EE', + "iexcl": '\U000000A1', + "igrave": '\U000000EC', + "iquest": '\U000000BF', + "iuml": '\U000000EF', + "laquo": '\U000000AB', + "lt": '\U0000003C', + "macr": '\U000000AF', + "micro": '\U000000B5', + "middot": '\U000000B7', + "nbsp": '\U000000A0', + "not": '\U000000AC', + "ntilde": '\U000000F1', + "oacute": '\U000000F3', + "ocirc": '\U000000F4', + "ograve": '\U000000F2', + "ordf": '\U000000AA', + "ordm": '\U000000BA', + "oslash": '\U000000F8', + "otilde": '\U000000F5', + "ouml": '\U000000F6', + "para": '\U000000B6', + "plusmn": '\U000000B1', + "pound": '\U000000A3', + "quot": '\U00000022', + "raquo": '\U000000BB', + "reg": '\U000000AE', + "sect": '\U000000A7', + "shy": '\U000000AD', + "sup1": '\U000000B9', + "sup2": '\U000000B2', + "sup3": '\U000000B3', + "szlig": '\U000000DF', + "thorn": '\U000000FE', + "times": '\U000000D7', + "uacute": '\U000000FA', + "ucirc": '\U000000FB', + "ugrave": '\U000000F9', + "uml": '\U000000A8', + "uuml": '\U000000FC', + "yacute": '\U000000FD', + "yen": '\U000000A5', + "yuml": '\U000000FF', } // HTML entities that are two unicode codepoints. diff --git a/src/math/lgamma.go b/src/math/lgamma.go index 7af5871744bc0..19ac3ffafcaf8 100644 --- a/src/math/lgamma.go +++ b/src/math/lgamma.go @@ -103,7 +103,7 @@ var _lgamA = [...]float64{ 4.48640949618915160150e-05, // 0x3F07858E90A45837 } var _lgamR = [...]float64{ - 1.0, // placeholder + 1.0, // placeholder 1.39200533467621045958e+00, // 0x3FF645A762C4AB74 7.21935547567138069525e-01, // 0x3FE71A1893D3DCDC 1.71933865632803078993e-01, // 0x3FC601EDCCFBDF27 diff --git a/src/math/rand/regress_test.go b/src/math/rand/regress_test.go index 1f30be85d1ac0..e31e6c5af026a 100644 --- a/src/math/rand/regress_test.go +++ b/src/math/rand/regress_test.go @@ -121,219 +121,219 @@ func TestRegress(t *testing.T) { } var regressGolden = []interface{}{ - float64(4.668112973579268), // ExpFloat64() - float64(0.1601593871172866), // ExpFloat64() - float64(3.0465834105636), // ExpFloat64() - float64(0.06385839451671879), // ExpFloat64() - float64(1.8578917487258961), // ExpFloat64() - float64(0.784676123472182), // ExpFloat64() - float64(0.11225477361256932), // ExpFloat64() - float64(0.20173283329802255), // ExpFloat64() - float64(0.3468619496201105), // ExpFloat64() - float64(0.35601103454384536), // ExpFloat64() - float64(0.888376329507869), // ExpFloat64() - float64(1.4081362450365698), // ExpFloat64() - float64(1.0077753823151994), // ExpFloat64() - float64(0.23594100766227588), // ExpFloat64() - float64(2.777245612300007), // ExpFloat64() - float64(0.5202997830662377), // ExpFloat64() - float64(1.2842705247770294), // ExpFloat64() - float64(0.030307408362776206), // ExpFloat64() - float64(2.204156824853721), // ExpFloat64() - float64(2.09891923895058), // ExpFloat64() - float32(0.94519615), // Float32() - float32(0.24496509), // Float32() - float32(0.65595627), // Float32() - float32(0.05434384), // Float32() - float32(0.3675872), // Float32() - float32(0.28948045), // Float32() - float32(0.1924386), // Float32() - float32(0.65533215), // Float32() - float32(0.8971697), // Float32() - float32(0.16735445), // Float32() - float32(0.28858566), // Float32() - float32(0.9026048), // Float32() - float32(0.84978026), // Float32() - float32(0.2730468), // Float32() - float32(0.6090802), // Float32() - float32(0.253656), // Float32() - float32(0.7746542), // Float32() - float32(0.017480763), // Float32() - float32(0.78707397), // Float32() - float32(0.7993937), // Float32() - float64(0.9451961492941164), // Float64() - float64(0.24496508529377975), // Float64() - float64(0.6559562651954052), // Float64() - float64(0.05434383959970039), // Float64() - float64(0.36758720663245853), // Float64() - float64(0.2894804331565928), // Float64() - float64(0.19243860967493215), // Float64() - float64(0.6553321508148324), // Float64() - float64(0.897169713149801), // Float64() - float64(0.16735444255905835), // Float64() - float64(0.2885856518054551), // Float64() - float64(0.9026048462705047), // Float64() - float64(0.8497802817628735), // Float64() - float64(0.2730468047134829), // Float64() - float64(0.6090801919903561), // Float64() - float64(0.25365600644283687), // Float64() - float64(0.7746542391859803), // Float64() - float64(0.017480762156647272), // Float64() - float64(0.7870739563039942), // Float64() - float64(0.7993936979594545), // Float64() - int64(8717895732742165505), // Int() - int64(2259404117704393152), // Int() - int64(6050128673802995827), // Int() - int64(501233450539197794), // Int() - int64(3390393562759376202), // Int() - int64(2669985732393126063), // Int() - int64(1774932891286980153), // Int() - int64(6044372234677422456), // Int() - int64(8274930044578894929), // Int() - int64(1543572285742637646), // Int() - int64(2661732831099943416), // Int() - int64(8325060299420976708), // Int() - int64(7837839688282259259), // Int() - int64(2518412263346885298), // Int() - int64(5617773211005988520), // Int() - int64(2339563716805116249), // Int() - int64(7144924247938981575), // Int() - int64(161231572858529631), // Int() - int64(7259475919510918339), // Int() - int64(7373105480197164748), // Int() - int32(2029793274), // Int31() - int32(526058514), // Int31() - int32(1408655353), // Int31() - int32(116702506), // Int31() - int32(789387515), // Int31() - int32(621654496), // Int31() - int32(413258767), // Int31() - int32(1407315077), // Int31() - int32(1926657288), // Int31() - int32(359390928), // Int31() - int32(619732968), // Int31() - int32(1938329147), // Int31() - int32(1824889259), // Int31() - int32(586363548), // Int31() - int32(1307989752), // Int31() - int32(544722126), // Int31() - int32(1663557311), // Int31() - int32(37539650), // Int31() - int32(1690228450), // Int31() - int32(1716684894), // Int31() - int32(0), // Int31n(1) - int32(4), // Int31n(10) - int32(25), // Int31n(32) - int32(310570), // Int31n(1048576) - int32(857611), // Int31n(1048577) - int32(621654496), // Int31n(1000000000) - int32(413258767), // Int31n(1073741824) - int32(1407315077), // Int31n(2147483646) - int32(1926657288), // Int31n(2147483647) - int32(0), // Int31n(1) - int32(8), // Int31n(10) - int32(27), // Int31n(32) - int32(367019), // Int31n(1048576) - int32(209005), // Int31n(1048577) - int32(307989752), // Int31n(1000000000) - int32(544722126), // Int31n(1073741824) - int32(1663557311), // Int31n(2147483646) - int32(37539650), // Int31n(2147483647) - int32(0), // Int31n(1) - int32(4), // Int31n(10) - int64(8717895732742165505), // Int63() - int64(2259404117704393152), // Int63() - int64(6050128673802995827), // Int63() - int64(501233450539197794), // Int63() - int64(3390393562759376202), // Int63() - int64(2669985732393126063), // Int63() - int64(1774932891286980153), // Int63() - int64(6044372234677422456), // Int63() - int64(8274930044578894929), // Int63() - int64(1543572285742637646), // Int63() - int64(2661732831099943416), // Int63() - int64(8325060299420976708), // Int63() - int64(7837839688282259259), // Int63() - int64(2518412263346885298), // Int63() - int64(5617773211005988520), // Int63() - int64(2339563716805116249), // Int63() - int64(7144924247938981575), // Int63() - int64(161231572858529631), // Int63() - int64(7259475919510918339), // Int63() - int64(7373105480197164748), // Int63() - int64(0), // Int63n(1) - int64(2), // Int63n(10) - int64(19), // Int63n(32) - int64(959842), // Int63n(1048576) - int64(688912), // Int63n(1048577) - int64(393126063), // Int63n(1000000000) - int64(89212473), // Int63n(1073741824) - int64(834026388), // Int63n(2147483646) - int64(1577188963), // Int63n(2147483647) - int64(543572285742637646), // Int63n(1000000000000000000) - int64(355889821886249464), // Int63n(1152921504606846976) - int64(8325060299420976708), // Int63n(9223372036854775806) - int64(7837839688282259259), // Int63n(9223372036854775807) - int64(0), // Int63n(1) - int64(0), // Int63n(10) - int64(25), // Int63n(32) - int64(679623), // Int63n(1048576) - int64(882178), // Int63n(1048577) - int64(510918339), // Int63n(1000000000) - int64(782454476), // Int63n(1073741824) - int64(0), // Intn(1) - int64(4), // Intn(10) - int64(25), // Intn(32) - int64(310570), // Intn(1048576) - int64(857611), // Intn(1048577) - int64(621654496), // Intn(1000000000) - int64(413258767), // Intn(1073741824) - int64(1407315077), // Intn(2147483646) - int64(1926657288), // Intn(2147483647) - int64(543572285742637646), // Intn(1000000000000000000) - int64(355889821886249464), // Intn(1152921504606846976) - int64(8325060299420976708), // Intn(9223372036854775806) - int64(7837839688282259259), // Intn(9223372036854775807) - int64(0), // Intn(1) - int64(2), // Intn(10) - int64(14), // Intn(32) - int64(515775), // Intn(1048576) - int64(839455), // Intn(1048577) - int64(690228450), // Intn(1000000000) - int64(642943070), // Intn(1073741824) - float64(-0.28158587086436215), // NormFloat64() - float64(0.570933095808067), // NormFloat64() - float64(-1.6920196326157044), // NormFloat64() - float64(0.1996229111693099), // NormFloat64() - float64(1.9195199291234621), // NormFloat64() - float64(0.8954838794918353), // NormFloat64() - float64(0.41457072128813166), // NormFloat64() - float64(-0.48700161491544713), // NormFloat64() - float64(-0.1684059662402393), // NormFloat64() - float64(0.37056410998929545), // NormFloat64() - float64(1.0156889027029008), // NormFloat64() - float64(-0.5174422210625114), // NormFloat64() - float64(-0.5565834214413804), // NormFloat64() - float64(0.778320596648391), // NormFloat64() - float64(-1.8970718197702225), // NormFloat64() - float64(0.5229525761688676), // NormFloat64() - float64(-1.5515595563231523), // NormFloat64() - float64(0.0182029289376123), // NormFloat64() - float64(-0.6820951356608795), // NormFloat64() - float64(-0.5987943422687668), // NormFloat64() - []int{}, // Perm(0) - []int{0}, // Perm(1) - []int{0, 4, 1, 3, 2}, // Perm(5) - []int{3, 1, 0, 4, 7, 5, 2, 6}, // Perm(8) - []int{5, 0, 3, 6, 7, 4, 2, 1, 8}, // Perm(9) - []int{4, 5, 0, 2, 6, 9, 3, 1, 8, 7}, // Perm(10) + float64(4.668112973579268), // ExpFloat64() + float64(0.1601593871172866), // ExpFloat64() + float64(3.0465834105636), // ExpFloat64() + float64(0.06385839451671879), // ExpFloat64() + float64(1.8578917487258961), // ExpFloat64() + float64(0.784676123472182), // ExpFloat64() + float64(0.11225477361256932), // ExpFloat64() + float64(0.20173283329802255), // ExpFloat64() + float64(0.3468619496201105), // ExpFloat64() + float64(0.35601103454384536), // ExpFloat64() + float64(0.888376329507869), // ExpFloat64() + float64(1.4081362450365698), // ExpFloat64() + float64(1.0077753823151994), // ExpFloat64() + float64(0.23594100766227588), // ExpFloat64() + float64(2.777245612300007), // ExpFloat64() + float64(0.5202997830662377), // ExpFloat64() + float64(1.2842705247770294), // ExpFloat64() + float64(0.030307408362776206), // ExpFloat64() + float64(2.204156824853721), // ExpFloat64() + float64(2.09891923895058), // ExpFloat64() + float32(0.94519615), // Float32() + float32(0.24496509), // Float32() + float32(0.65595627), // Float32() + float32(0.05434384), // Float32() + float32(0.3675872), // Float32() + float32(0.28948045), // Float32() + float32(0.1924386), // Float32() + float32(0.65533215), // Float32() + float32(0.8971697), // Float32() + float32(0.16735445), // Float32() + float32(0.28858566), // Float32() + float32(0.9026048), // Float32() + float32(0.84978026), // Float32() + float32(0.2730468), // Float32() + float32(0.6090802), // Float32() + float32(0.253656), // Float32() + float32(0.7746542), // Float32() + float32(0.017480763), // Float32() + float32(0.78707397), // Float32() + float32(0.7993937), // Float32() + float64(0.9451961492941164), // Float64() + float64(0.24496508529377975), // Float64() + float64(0.6559562651954052), // Float64() + float64(0.05434383959970039), // Float64() + float64(0.36758720663245853), // Float64() + float64(0.2894804331565928), // Float64() + float64(0.19243860967493215), // Float64() + float64(0.6553321508148324), // Float64() + float64(0.897169713149801), // Float64() + float64(0.16735444255905835), // Float64() + float64(0.2885856518054551), // Float64() + float64(0.9026048462705047), // Float64() + float64(0.8497802817628735), // Float64() + float64(0.2730468047134829), // Float64() + float64(0.6090801919903561), // Float64() + float64(0.25365600644283687), // Float64() + float64(0.7746542391859803), // Float64() + float64(0.017480762156647272), // Float64() + float64(0.7870739563039942), // Float64() + float64(0.7993936979594545), // Float64() + int64(8717895732742165505), // Int() + int64(2259404117704393152), // Int() + int64(6050128673802995827), // Int() + int64(501233450539197794), // Int() + int64(3390393562759376202), // Int() + int64(2669985732393126063), // Int() + int64(1774932891286980153), // Int() + int64(6044372234677422456), // Int() + int64(8274930044578894929), // Int() + int64(1543572285742637646), // Int() + int64(2661732831099943416), // Int() + int64(8325060299420976708), // Int() + int64(7837839688282259259), // Int() + int64(2518412263346885298), // Int() + int64(5617773211005988520), // Int() + int64(2339563716805116249), // Int() + int64(7144924247938981575), // Int() + int64(161231572858529631), // Int() + int64(7259475919510918339), // Int() + int64(7373105480197164748), // Int() + int32(2029793274), // Int31() + int32(526058514), // Int31() + int32(1408655353), // Int31() + int32(116702506), // Int31() + int32(789387515), // Int31() + int32(621654496), // Int31() + int32(413258767), // Int31() + int32(1407315077), // Int31() + int32(1926657288), // Int31() + int32(359390928), // Int31() + int32(619732968), // Int31() + int32(1938329147), // Int31() + int32(1824889259), // Int31() + int32(586363548), // Int31() + int32(1307989752), // Int31() + int32(544722126), // Int31() + int32(1663557311), // Int31() + int32(37539650), // Int31() + int32(1690228450), // Int31() + int32(1716684894), // Int31() + int32(0), // Int31n(1) + int32(4), // Int31n(10) + int32(25), // Int31n(32) + int32(310570), // Int31n(1048576) + int32(857611), // Int31n(1048577) + int32(621654496), // Int31n(1000000000) + int32(413258767), // Int31n(1073741824) + int32(1407315077), // Int31n(2147483646) + int32(1926657288), // Int31n(2147483647) + int32(0), // Int31n(1) + int32(8), // Int31n(10) + int32(27), // Int31n(32) + int32(367019), // Int31n(1048576) + int32(209005), // Int31n(1048577) + int32(307989752), // Int31n(1000000000) + int32(544722126), // Int31n(1073741824) + int32(1663557311), // Int31n(2147483646) + int32(37539650), // Int31n(2147483647) + int32(0), // Int31n(1) + int32(4), // Int31n(10) + int64(8717895732742165505), // Int63() + int64(2259404117704393152), // Int63() + int64(6050128673802995827), // Int63() + int64(501233450539197794), // Int63() + int64(3390393562759376202), // Int63() + int64(2669985732393126063), // Int63() + int64(1774932891286980153), // Int63() + int64(6044372234677422456), // Int63() + int64(8274930044578894929), // Int63() + int64(1543572285742637646), // Int63() + int64(2661732831099943416), // Int63() + int64(8325060299420976708), // Int63() + int64(7837839688282259259), // Int63() + int64(2518412263346885298), // Int63() + int64(5617773211005988520), // Int63() + int64(2339563716805116249), // Int63() + int64(7144924247938981575), // Int63() + int64(161231572858529631), // Int63() + int64(7259475919510918339), // Int63() + int64(7373105480197164748), // Int63() + int64(0), // Int63n(1) + int64(2), // Int63n(10) + int64(19), // Int63n(32) + int64(959842), // Int63n(1048576) + int64(688912), // Int63n(1048577) + int64(393126063), // Int63n(1000000000) + int64(89212473), // Int63n(1073741824) + int64(834026388), // Int63n(2147483646) + int64(1577188963), // Int63n(2147483647) + int64(543572285742637646), // Int63n(1000000000000000000) + int64(355889821886249464), // Int63n(1152921504606846976) + int64(8325060299420976708), // Int63n(9223372036854775806) + int64(7837839688282259259), // Int63n(9223372036854775807) + int64(0), // Int63n(1) + int64(0), // Int63n(10) + int64(25), // Int63n(32) + int64(679623), // Int63n(1048576) + int64(882178), // Int63n(1048577) + int64(510918339), // Int63n(1000000000) + int64(782454476), // Int63n(1073741824) + int64(0), // Intn(1) + int64(4), // Intn(10) + int64(25), // Intn(32) + int64(310570), // Intn(1048576) + int64(857611), // Intn(1048577) + int64(621654496), // Intn(1000000000) + int64(413258767), // Intn(1073741824) + int64(1407315077), // Intn(2147483646) + int64(1926657288), // Intn(2147483647) + int64(543572285742637646), // Intn(1000000000000000000) + int64(355889821886249464), // Intn(1152921504606846976) + int64(8325060299420976708), // Intn(9223372036854775806) + int64(7837839688282259259), // Intn(9223372036854775807) + int64(0), // Intn(1) + int64(2), // Intn(10) + int64(14), // Intn(32) + int64(515775), // Intn(1048576) + int64(839455), // Intn(1048577) + int64(690228450), // Intn(1000000000) + int64(642943070), // Intn(1073741824) + float64(-0.28158587086436215), // NormFloat64() + float64(0.570933095808067), // NormFloat64() + float64(-1.6920196326157044), // NormFloat64() + float64(0.1996229111693099), // NormFloat64() + float64(1.9195199291234621), // NormFloat64() + float64(0.8954838794918353), // NormFloat64() + float64(0.41457072128813166), // NormFloat64() + float64(-0.48700161491544713), // NormFloat64() + float64(-0.1684059662402393), // NormFloat64() + float64(0.37056410998929545), // NormFloat64() + float64(1.0156889027029008), // NormFloat64() + float64(-0.5174422210625114), // NormFloat64() + float64(-0.5565834214413804), // NormFloat64() + float64(0.778320596648391), // NormFloat64() + float64(-1.8970718197702225), // NormFloat64() + float64(0.5229525761688676), // NormFloat64() + float64(-1.5515595563231523), // NormFloat64() + float64(0.0182029289376123), // NormFloat64() + float64(-0.6820951356608795), // NormFloat64() + float64(-0.5987943422687668), // NormFloat64() + []int{}, // Perm(0) + []int{0}, // Perm(1) + []int{0, 4, 1, 3, 2}, // Perm(5) + []int{3, 1, 0, 4, 7, 5, 2, 6}, // Perm(8) + []int{5, 0, 3, 6, 7, 4, 2, 1, 8}, // Perm(9) + []int{4, 5, 0, 2, 6, 9, 3, 1, 8, 7}, // Perm(10) []int{14, 2, 0, 8, 3, 5, 13, 12, 1, 4, 6, 7, 11, 9, 15, 10}, // Perm(16) - []int{}, // Perm(0) - []int{0}, // Perm(1) - []int{3, 0, 1, 2, 4}, // Perm(5) - []int{5, 1, 2, 0, 4, 7, 3, 6}, // Perm(8) - []int{4, 0, 6, 8, 1, 5, 2, 7, 3}, // Perm(9) - []int{8, 6, 1, 7, 5, 4, 3, 2, 9, 0}, // Perm(10) + []int{}, // Perm(0) + []int{0}, // Perm(1) + []int{3, 0, 1, 2, 4}, // Perm(5) + []int{5, 1, 2, 0, 4, 7, 3, 6}, // Perm(8) + []int{4, 0, 6, 8, 1, 5, 2, 7, 3}, // Perm(9) + []int{8, 6, 1, 7, 5, 4, 3, 2, 9, 0}, // Perm(10) []int{0, 3, 13, 2, 15, 4, 10, 1, 8, 14, 7, 6, 12, 9, 5, 11}, // Perm(16) []int{}, // Perm(0) []int{0}, // Perm(1) @@ -346,7 +346,7 @@ var regressGolden = []interface{}{ []byte{0x41, 0xd3, 0xff, 0x12, 0x4, 0x5b, 0x73, 0xc8}, // Read([0 0 0 0 0 0 0 0]) []byte{0x6e, 0x4f, 0xf9, 0x5f, 0xf6, 0x62, 0xa5, 0xee, 0xe8}, // Read([0 0 0 0 0 0 0 0 0]) []byte{0x2a, 0xbd, 0xf4, 0x4a, 0x2d, 0xb, 0x75, 0xfb, 0x18, 0xd}, // Read([0 0 0 0 0 0 0 0 0 0]) - []byte{0xaf}, // Read([0]) + []byte{0xaf}, // Read([0]) []byte{0x48, 0xa7, 0x9e, 0xe0, 0xb1, 0xd, 0x39}, // Read([0 0 0 0 0 0 0]) []byte{0x46, 0x51, 0x85, 0xf, 0xd4, 0xa1, 0x78, 0x89}, // Read([0 0 0 0 0 0 0 0]) []byte{0x2e, 0xe2, 0x85, 0xec, 0xe1, 0x51, 0x14, 0x55, 0x78}, // Read([0 0 0 0 0 0 0 0 0]) @@ -356,49 +356,49 @@ var regressGolden = []interface{}{ []byte{0xc6, 0xb1, 0xf8, 0x3b, 0x8e, 0x88, 0x3b, 0xbf}, // Read([0 0 0 0 0 0 0 0]) []byte{0x85, 0x7a, 0xab, 0x99, 0xc5, 0xb2, 0x52, 0xc7, 0x42}, // Read([0 0 0 0 0 0 0 0 0]) []byte{0x9c, 0x32, 0xf3, 0xa8, 0xae, 0xb7, 0x9e, 0xf8, 0x56, 0xf6}, // Read([0 0 0 0 0 0 0 0 0 0]) - []byte{0x59}, // Read([0]) + []byte{0x59}, // Read([0]) []byte{0xc1, 0x8f, 0xd, 0xce, 0xcc, 0x77, 0xc7}, // Read([0 0 0 0 0 0 0]) []byte{0x5e, 0x7a, 0x81, 0xbf, 0xde, 0x27, 0x5f, 0x67}, // Read([0 0 0 0 0 0 0 0]) []byte{0xcf, 0xe2, 0x42, 0xcf, 0x3c, 0xc3, 0x54, 0xf3, 0xed}, // Read([0 0 0 0 0 0 0 0 0]) []byte{0xe2, 0xd6, 0xbe, 0xcc, 0x4e, 0xa3, 0xae, 0x5e, 0x88, 0x52}, // Read([0 0 0 0 0 0 0 0 0 0]) - uint32(4059586549), // Uint32() - uint32(1052117029), // Uint32() - uint32(2817310706), // Uint32() - uint32(233405013), // Uint32() - uint32(1578775030), // Uint32() - uint32(1243308993), // Uint32() - uint32(826517535), // Uint32() - uint32(2814630155), // Uint32() - uint32(3853314576), // Uint32() - uint32(718781857), // Uint32() - uint32(1239465936), // Uint32() - uint32(3876658295), // Uint32() - uint32(3649778518), // Uint32() - uint32(1172727096), // Uint32() - uint32(2615979505), // Uint32() - uint32(1089444252), // Uint32() - uint32(3327114623), // Uint32() - uint32(75079301), // Uint32() - uint32(3380456901), // Uint32() - uint32(3433369789), // Uint32() - uint64(8717895732742165505), // Uint64() - uint64(2259404117704393152), // Uint64() - uint64(6050128673802995827), // Uint64() - uint64(9724605487393973602), // Uint64() - uint64(12613765599614152010), // Uint64() - uint64(11893357769247901871), // Uint64() - uint64(1774932891286980153), // Uint64() - uint64(15267744271532198264), // Uint64() - uint64(17498302081433670737), // Uint64() - uint64(1543572285742637646), // Uint64() - uint64(11885104867954719224), // Uint64() - uint64(17548432336275752516), // Uint64() - uint64(7837839688282259259), // Uint64() - uint64(2518412263346885298), // Uint64() - uint64(5617773211005988520), // Uint64() - uint64(11562935753659892057), // Uint64() - uint64(16368296284793757383), // Uint64() - uint64(161231572858529631), // Uint64() - uint64(16482847956365694147), // Uint64() - uint64(16596477517051940556), // Uint64() + uint32(4059586549), // Uint32() + uint32(1052117029), // Uint32() + uint32(2817310706), // Uint32() + uint32(233405013), // Uint32() + uint32(1578775030), // Uint32() + uint32(1243308993), // Uint32() + uint32(826517535), // Uint32() + uint32(2814630155), // Uint32() + uint32(3853314576), // Uint32() + uint32(718781857), // Uint32() + uint32(1239465936), // Uint32() + uint32(3876658295), // Uint32() + uint32(3649778518), // Uint32() + uint32(1172727096), // Uint32() + uint32(2615979505), // Uint32() + uint32(1089444252), // Uint32() + uint32(3327114623), // Uint32() + uint32(75079301), // Uint32() + uint32(3380456901), // Uint32() + uint32(3433369789), // Uint32() + uint64(8717895732742165505), // Uint64() + uint64(2259404117704393152), // Uint64() + uint64(6050128673802995827), // Uint64() + uint64(9724605487393973602), // Uint64() + uint64(12613765599614152010), // Uint64() + uint64(11893357769247901871), // Uint64() + uint64(1774932891286980153), // Uint64() + uint64(15267744271532198264), // Uint64() + uint64(17498302081433670737), // Uint64() + uint64(1543572285742637646), // Uint64() + uint64(11885104867954719224), // Uint64() + uint64(17548432336275752516), // Uint64() + uint64(7837839688282259259), // Uint64() + uint64(2518412263346885298), // Uint64() + uint64(5617773211005988520), // Uint64() + uint64(11562935753659892057), // Uint64() + uint64(16368296284793757383), // Uint64() + uint64(161231572858529631), // Uint64() + uint64(16482847956365694147), // Uint64() + uint64(16596477517051940556), // Uint64() } diff --git a/src/net/http/cgi/host_test.go b/src/net/http/cgi/host_test.go index 1790d5de982fb..9c7fb42a59f69 100644 --- a/src/net/http/cgi/host_test.go +++ b/src/net/http/cgi/host_test.go @@ -525,7 +525,7 @@ func TestEnvOverride(t *testing.T) { "PATH=/wibble"}, } expectedMap := map[string]string{ - "cwd": cwd, + "cwd": cwd, "env-SCRIPT_FILENAME": cgifile, "env-REQUEST_URI": "/foo/bar", "env-PATH": "/wibble", diff --git a/src/net/http/main_test.go b/src/net/http/main_test.go index 7936fb3044e65..21c850566cc2b 100644 --- a/src/net/http/main_test.go +++ b/src/net/http/main_test.go @@ -114,12 +114,12 @@ func afterTest(t testing.TB) { } var bad string badSubstring := map[string]string{ - ").readLoop(": "a Transport", - ").writeLoop(": "a Transport", + ").readLoop(": "a Transport", + ").writeLoop(": "a Transport", "created by net/http/httptest.(*Server).Start": "an httptest.Server", - "timeoutHandler": "a TimeoutHandler", - "net.(*netFD).connect(": "a timing out dial", - ").noteClientGone(": "a closenotifier sender", + "timeoutHandler": "a TimeoutHandler", + "net.(*netFD).connect(": "a timing out dial", + ").noteClientGone(": "a closenotifier sender", } var stacks string for i := 0; i < 4; i++ { diff --git a/src/net/url/url_test.go b/src/net/url/url_test.go index 7f03d2b9def42..f2d311a998697 100644 --- a/src/net/url/url_test.go +++ b/src/net/url/url_test.go @@ -1433,8 +1433,8 @@ func TestParseErrors(t *testing.T) { {"mysql://x@y(1.2.3.4:123)/foo", false}, {"http://[]%20%48%54%54%50%2f%31%2e%31%0a%4d%79%48%65%61%64%65%72%3a%20%31%32%33%0a%0a/", true}, // golang.org/issue/11208 - {"http://a b.com/", true}, // no space in host name please - {"cache_object://foo", true}, // scheme cannot have _, relative path cannot have : in first segment + {"http://a b.com/", true}, // no space in host name please + {"cache_object://foo", true}, // scheme cannot have _, relative path cannot have : in first segment {"cache_object:foo", true}, {"cache_object:foo/bar", true}, {"cache_object/:foo/bar", false}, diff --git a/src/runtime/map_test.go b/src/runtime/map_test.go index 0f20c84e77c51..4b8a32d93c308 100644 --- a/src/runtime/map_test.go +++ b/src/runtime/map_test.go @@ -435,11 +435,11 @@ func TestEmptyKeyAndValue(t *testing.T) { // ("quick keys") as well as long keys. func TestSingleBucketMapStringKeys_DupLen(t *testing.T) { testMapLookups(t, map[string]string{ - "x": "x1val", - "xx": "x2val", - "foo": "fooval", - "bar": "barval", // same key length as "foo" - "xxxx": "x4val", + "x": "x1val", + "xx": "x2val", + "foo": "fooval", + "bar": "barval", // same key length as "foo" + "xxxx": "x4val", strings.Repeat("x", 128): "longval1", strings.Repeat("y", 128): "longval2", }) diff --git a/src/time/time_test.go b/src/time/time_test.go index 432a67dec3c5d..ff7f4b0429612 100644 --- a/src/time/time_test.go +++ b/src/time/time_test.go @@ -675,7 +675,7 @@ var gobTests = []Time{ Date(0, 1, 2, 3, 4, 5, 6, UTC), Date(7, 8, 9, 10, 11, 12, 13, FixedZone("", 0)), Unix(81985467080890095, 0x76543210), // Time.sec: 0x0123456789ABCDEF - {}, // nil location + {}, // nil location Date(1, 2, 3, 4, 5, 6, 7, FixedZone("", 32767*60)), Date(1, 2, 3, 4, 5, 6, 7, FixedZone("", -32768*60)), } diff --git a/src/time/zoneinfo_abbrs_windows.go b/src/time/zoneinfo_abbrs_windows.go index 76ee528388b75..db0bbfd74f4d7 100644 --- a/src/time/zoneinfo_abbrs_windows.go +++ b/src/time/zoneinfo_abbrs_windows.go @@ -109,41 +109,41 @@ var abbrs = map[string]abbr{ "Lord Howe Standard Time": {"+1030", "+11"}, // Australia/Lord_Howe "W. Australia Standard Time": {"AWST", "AWST"}, // Australia/Perth "AUS Eastern Standard Time": {"AEST", "AEDT"}, // Australia/Sydney - "UTC": {"GMT", "GMT"}, // Etc/GMT - "UTC-11": {"-11", "-11"}, // Etc/GMT+11 - "Dateline Standard Time": {"-12", "-12"}, // Etc/GMT+12 - "UTC-02": {"-02", "-02"}, // Etc/GMT+2 - "UTC-08": {"-08", "-08"}, // Etc/GMT+8 - "UTC-09": {"-09", "-09"}, // Etc/GMT+9 - "UTC+12": {"+12", "+12"}, // Etc/GMT-12 - "UTC+13": {"+13", "+13"}, // Etc/GMT-13 - "Astrakhan Standard Time": {"+04", "+04"}, // Europe/Astrakhan - "W. Europe Standard Time": {"CET", "CEST"}, // Europe/Berlin - "GTB Standard Time": {"EET", "EEST"}, // Europe/Bucharest - "Central Europe Standard Time": {"CET", "CEST"}, // Europe/Budapest - "E. Europe Standard Time": {"EET", "EEST"}, // Europe/Chisinau - "Turkey Standard Time": {"+03", "+03"}, // Europe/Istanbul - "Kaliningrad Standard Time": {"EET", "EET"}, // Europe/Kaliningrad - "FLE Standard Time": {"EET", "EEST"}, // Europe/Kiev - "GMT Standard Time": {"GMT", "BST"}, // Europe/London - "Belarus Standard Time": {"+03", "+03"}, // Europe/Minsk - "Russian Standard Time": {"MSK", "MSK"}, // Europe/Moscow - "Romance Standard Time": {"CET", "CEST"}, // Europe/Paris - "Russia Time Zone 3": {"+04", "+04"}, // Europe/Samara - "Saratov Standard Time": {"+03", "+04"}, // Europe/Saratov - "Central European Standard Time": {"CET", "CEST"}, // Europe/Warsaw - "Mauritius Standard Time": {"+04", "+04"}, // Indian/Mauritius - "Samoa Standard Time": {"+13", "+14"}, // Pacific/Apia - "New Zealand Standard Time": {"NZST", "NZDT"}, // Pacific/Auckland - "Bougainville Standard Time": {"+11", "+11"}, // Pacific/Bougainville - "Chatham Islands Standard Time": {"+1245", "+1345"}, // Pacific/Chatham - "Easter Island Standard Time": {"-06", "-05"}, // Pacific/Easter - "Fiji Standard Time": {"+12", "+13"}, // Pacific/Fiji - "Central Pacific Standard Time": {"+11", "+11"}, // Pacific/Guadalcanal - "Hawaiian Standard Time": {"HST", "HST"}, // Pacific/Honolulu - "Line Islands Standard Time": {"+14", "+14"}, // Pacific/Kiritimati - "Marquesas Standard Time": {"-0930", "-0930"}, // Pacific/Marquesas - "Norfolk Standard Time": {"+11", "+11"}, // Pacific/Norfolk - "West Pacific Standard Time": {"+10", "+10"}, // Pacific/Port_Moresby - "Tonga Standard Time": {"+13", "+14"}, // Pacific/Tongatapu + "UTC": {"GMT", "GMT"}, // Etc/GMT + "UTC-11": {"-11", "-11"}, // Etc/GMT+11 + "Dateline Standard Time": {"-12", "-12"}, // Etc/GMT+12 + "UTC-02": {"-02", "-02"}, // Etc/GMT+2 + "UTC-08": {"-08", "-08"}, // Etc/GMT+8 + "UTC-09": {"-09", "-09"}, // Etc/GMT+9 + "UTC+12": {"+12", "+12"}, // Etc/GMT-12 + "UTC+13": {"+13", "+13"}, // Etc/GMT-13 + "Astrakhan Standard Time": {"+04", "+04"}, // Europe/Astrakhan + "W. Europe Standard Time": {"CET", "CEST"}, // Europe/Berlin + "GTB Standard Time": {"EET", "EEST"}, // Europe/Bucharest + "Central Europe Standard Time": {"CET", "CEST"}, // Europe/Budapest + "E. Europe Standard Time": {"EET", "EEST"}, // Europe/Chisinau + "Turkey Standard Time": {"+03", "+03"}, // Europe/Istanbul + "Kaliningrad Standard Time": {"EET", "EET"}, // Europe/Kaliningrad + "FLE Standard Time": {"EET", "EEST"}, // Europe/Kiev + "GMT Standard Time": {"GMT", "BST"}, // Europe/London + "Belarus Standard Time": {"+03", "+03"}, // Europe/Minsk + "Russian Standard Time": {"MSK", "MSK"}, // Europe/Moscow + "Romance Standard Time": {"CET", "CEST"}, // Europe/Paris + "Russia Time Zone 3": {"+04", "+04"}, // Europe/Samara + "Saratov Standard Time": {"+03", "+04"}, // Europe/Saratov + "Central European Standard Time": {"CET", "CEST"}, // Europe/Warsaw + "Mauritius Standard Time": {"+04", "+04"}, // Indian/Mauritius + "Samoa Standard Time": {"+13", "+14"}, // Pacific/Apia + "New Zealand Standard Time": {"NZST", "NZDT"}, // Pacific/Auckland + "Bougainville Standard Time": {"+11", "+11"}, // Pacific/Bougainville + "Chatham Islands Standard Time": {"+1245", "+1345"}, // Pacific/Chatham + "Easter Island Standard Time": {"-06", "-05"}, // Pacific/Easter + "Fiji Standard Time": {"+12", "+13"}, // Pacific/Fiji + "Central Pacific Standard Time": {"+11", "+11"}, // Pacific/Guadalcanal + "Hawaiian Standard Time": {"HST", "HST"}, // Pacific/Honolulu + "Line Islands Standard Time": {"+14", "+14"}, // Pacific/Kiritimati + "Marquesas Standard Time": {"-0930", "-0930"}, // Pacific/Marquesas + "Norfolk Standard Time": {"+11", "+11"}, // Pacific/Norfolk + "West Pacific Standard Time": {"+10", "+10"}, // Pacific/Port_Moresby + "Tonga Standard Time": {"+13", "+14"}, // Pacific/Tongatapu } diff --git a/test/235.go b/test/235.go index 6745dde41ab7d..a62d384a658bb 100644 --- a/test/235.go +++ b/test/235.go @@ -16,13 +16,12 @@ func M(f uint64) (in, out T) { out = make(T, 100) go func(in, out T, f uint64) { for { - out <- f*<-in + out <- f * <-in } }(in, out, f) return in, out } - func min(xs []uint64) uint64 { m := xs[0] for i := 1; i < len(xs); i++ { @@ -33,7 +32,6 @@ func min(xs []uint64) uint64 { return m } - func main() { F := []uint64{2, 3, 5} var n = len(F) diff --git a/test/64bit.go b/test/64bit.go index d99d8e83f0d54..9eaac1409a26e 100644 --- a/test/64bit.go +++ b/test/64bit.go @@ -25,13 +25,13 @@ var bout *bufio.Writer // if the compiler has buggy or missing 64-bit support. type Uint64 struct { - hi uint32 - lo uint32 + hi uint32 + lo uint32 } type Int64 struct { - hi int32 - lo uint32 + hi int32 + lo uint32 } func (a Uint64) Int64() (c Int64) { @@ -170,7 +170,7 @@ func (a Uint64) DivMod(b Uint64) (quo, rem Uint64) { b = b.LeftShift(uint(n)) for i := 0; i <= n; i++ { quo = quo.LeftShift(1) - if b.Cmp(a) <= 0 { // b <= a + if b.Cmp(a) <= 0 { // b <= a quo.lo |= 1 a = a.Minus(b) } @@ -205,7 +205,7 @@ func (a Uint64) Xor(b Uint64) (c Uint64) { return } -func (a Uint64) String() string { return fmt.Sprintf("%#x%08x", a.hi, a.lo) } +func (a Uint64) String() string { return fmt.Sprintf("%#x%08x", a.hi, a.lo) } func (a Int64) Uint64() (c Uint64) { c.hi = uint32(a.hi) @@ -230,15 +230,15 @@ func (a Int64) Cmp(b Int64) int { return 0 } -func (a Int64) LeftShift(b uint) (c Int64) { return a.Uint64().LeftShift(b).Int64() } +func (a Int64) LeftShift(b uint) (c Int64) { return a.Uint64().LeftShift(b).Int64() } func (a Int64) RightShift(b uint) (c Int64) { switch { case b >= 64: - c.hi = a.hi >> 31 // sign extend + c.hi = a.hi >> 31 // sign extend c.lo = uint32(c.hi) case b >= 32: - c.hi = a.hi >> 31 // sign extend + c.hi = a.hi >> 31 // sign extend c.lo = uint32(a.hi >> (b - 32)) default: c.hi = a.hi >> b @@ -261,15 +261,15 @@ func (a Int64) RightShift64(b Uint64) (c Int64) { return a.RightShift(uint(b.lo)) } -func (a Int64) Plus(b Int64) (c Int64) { return a.Uint64().Plus(b.Uint64()).Int64() } +func (a Int64) Plus(b Int64) (c Int64) { return a.Uint64().Plus(b.Uint64()).Int64() } -func (a Int64) Minus(b Int64) (c Int64) { return a.Uint64().Minus(b.Uint64()).Int64() } +func (a Int64) Minus(b Int64) (c Int64) { return a.Uint64().Minus(b.Uint64()).Int64() } -func (a Int64) Neg() (c Int64) { return a.Uint64().Neg().Int64() } +func (a Int64) Neg() (c Int64) { return a.Uint64().Neg().Int64() } -func (a Int64) Com() (c Int64) { return a.Uint64().Com().Int64() } +func (a Int64) Com() (c Int64) { return a.Uint64().Com().Int64() } -func (a Int64) Times(b Int64) (c Int64) { return a.Uint64().Times(b.Uint64()).Int64() } +func (a Int64) Times(b Int64) (c Int64) { return a.Uint64().Times(b.Uint64()).Int64() } func (a Int64) DivMod(b Int64) (quo Int64, rem Int64) { var zero Int64 @@ -299,13 +299,13 @@ func (a Int64) DivMod(b Int64) (quo Int64, rem Int64) { return } -func (a Int64) And(b Int64) (c Int64) { return a.Uint64().And(b.Uint64()).Int64() } +func (a Int64) And(b Int64) (c Int64) { return a.Uint64().And(b.Uint64()).Int64() } -func (a Int64) AndNot(b Int64) (c Int64) { return a.Uint64().AndNot(b.Uint64()).Int64() } +func (a Int64) AndNot(b Int64) (c Int64) { return a.Uint64().AndNot(b.Uint64()).Int64() } -func (a Int64) Or(b Int64) (c Int64) { return a.Uint64().Or(b.Uint64()).Int64() } +func (a Int64) Or(b Int64) (c Int64) { return a.Uint64().Or(b.Uint64()).Int64() } -func (a Int64) Xor(b Int64) (c Int64) { return a.Uint64().Xor(b.Uint64()).Int64() } +func (a Int64) Xor(b Int64) (c Int64) { return a.Uint64().Xor(b.Uint64()).Int64() } func (a Int64) String() string { if a.hi < 0 { @@ -514,11 +514,11 @@ func varTests() { var div, mod Int64 dodiv := false var zero Int64 - if b.Cmp(zero) != 0 { // b != 0 + if b.Cmp(zero) != 0 { // b != 0 // Can't divide by zero but also can't divide -0x8000...000 by -1. var bigneg = Int64{-0x80000000, 0} var minus1 = Int64{-1, ^uint32(0)} - if a.Cmp(bigneg) != 0 || b.Cmp(minus1) != 0 { // a != -1<<63 || b != -1 + if a.Cmp(bigneg) != 0 || b.Cmp(minus1) != 0 { // a != -1<<63 || b != -1 div, mod = a.DivMod(b) dodiv = true } @@ -542,7 +542,7 @@ func varTests() { var div, mod Uint64 dodiv := false var zero Uint64 - if b.Cmp(zero) != 0 { // b != 0 + if b.Cmp(zero) != 0 { // b != 0 div, mod = a.DivMod(b) dodiv = true } @@ -661,11 +661,11 @@ func constTests() { var div, mod Int64 dodiv := false var zero Int64 - if b.Cmp(zero) != 0 { // b != 0 + if b.Cmp(zero) != 0 { // b != 0 // Can't divide by zero but also can't divide -0x8000...000 by -1. var bigneg = Int64{-0x80000000, 0} var minus1 = Int64{-1, ^uint32(0)} - if a.Cmp(bigneg) != 0 || b.Cmp(minus1) != 0 { // a != -1<<63 || b != -1 + if a.Cmp(bigneg) != 0 || b.Cmp(minus1) != 0 { // a != -1<<63 || b != -1 div, mod = a.DivMod(b) dodiv = true } @@ -692,7 +692,7 @@ func constTests() { var div, mod Uint64 dodiv := false var zero Uint64 - if b.Cmp(zero) != 0 { // b != 0 + if b.Cmp(zero) != 0 { // b != 0 div, mod = a.DivMod(b) dodiv = true } diff --git a/test/align.go b/test/align.go index 61d07c49b8687..6e33983275148 100644 --- a/test/align.go +++ b/test/align.go @@ -13,7 +13,7 @@ package main // introduced by CL 102036. type T struct { pad uint32 - f float64 + f float64 } //go:noinline diff --git a/test/assign1.go b/test/assign1.go index b9e0325ce8c97..eabf10062d6a2 100644 --- a/test/assign1.go +++ b/test/assign1.go @@ -214,7 +214,6 @@ func main() { ps1 = ps0 // ERROR "cannot use|incompatible" ps1 = ps // ERROR "cannot use|incompatible" - a0 = [10]int(a) a0 = [10]int(a1) a = A(a0) @@ -236,8 +235,8 @@ func main() { c1 = C1(c0) c1 = C1(c) - f0 = func() int(f) - f0 = func() int(f1) + f0 = (func() int)(f) + f0 = (func() int)(f1) f = F(f0) f = F(f1) f1 = F1(f0) diff --git a/test/bigmap.go b/test/bigmap.go index c5e4f91e11951..77ff8243c58eb 100644 --- a/test/bigmap.go +++ b/test/bigmap.go @@ -35,7 +35,6 @@ func main() { cmp(m[1], seq(11, 13)) cmp(m[2], seq(2, 9)) cmp(m[3], seq(3, 17)) - { type T [1]byte @@ -47,7 +46,7 @@ func main() { println(x, y) panic("bad map") } - } + } { type T [100]byte type V [1]byte @@ -134,6 +133,6 @@ func main() { if x, y := m[T{}][0], m[T{1}][0]; x != 1 || y != 2 { println(x, y) panic("bad map") - } - } + } + } } diff --git a/test/blank1.go b/test/blank1.go index bf94d1a0fb91d..a29992c367dd0 100644 --- a/test/blank1.go +++ b/test/blank1.go @@ -7,7 +7,7 @@ // Test that incorrect uses of the blank identifer are caught. // Does not compile. -package _ // ERROR "invalid package name _" +package _ // ERROR "invalid package name _" var t struct { _ int @@ -18,15 +18,15 @@ func (x int) _() { // ERROR "cannot define new methods on non-local type" } type T struct { - _ []int + _ []int } func main() { - _() // ERROR "cannot use _ as value" - x := _+1 // ERROR "cannot use _ as value" + _() // ERROR "cannot use _ as value" + x := _ + 1 // ERROR "cannot use _ as value" _ = x _ = t._ // ERROR "cannot refer to blank field|invalid use of" - var v1, v2 T - _ = v1 == v2 // ERROR "cannot be compared|non-comparable" + var v1, v2 T + _ = v1 == v2 // ERROR "cannot be compared|non-comparable" } diff --git a/test/char_lit.go b/test/char_lit.go index 836c3c1a2d0b0..e452db952ee92 100644 --- a/test/char_lit.go +++ b/test/char_lit.go @@ -11,8 +11,7 @@ package main import "os" func main() { - var i uint64 = - ' ' + + var i uint64 = ' ' + 'a' + 'ä' + '本' + diff --git a/test/closedchan.go b/test/closedchan.go index 043a92d3880e8..5221d257b49c0 100644 --- a/test/closedchan.go +++ b/test/closedchan.go @@ -18,7 +18,7 @@ var failed bool type Chan interface { Send(int) Nbsend(int) bool - Recv() (int) + Recv() int Nbrecv() (int, bool) Recv2() (int, bool) Nbrecv2() (int, bool, bool) @@ -214,7 +214,6 @@ func (c SSChan) Impl() string { return "(select)" } - func shouldPanic(f func()) { defer func() { if recover() == nil { @@ -318,13 +317,13 @@ func closedasync() chan int { return c } -var mks = []func(chan int) Chan { +var mks = []func(chan int) Chan{ func(c chan int) Chan { return XChan(c) }, func(c chan int) Chan { return SChan(c) }, func(c chan int) Chan { return SSChan(c) }, } -var testcloseds = []func(Chan) { +var testcloseds = []func(Chan){ testasync1, testasync2, testasync3, @@ -335,18 +334,18 @@ func main() { for _, mk := range mks { test1(mk(closedsync())) } - + for _, testclosed := range testcloseds { for _, mk := range mks { testclosed(mk(closedasync())) } } - - var ch chan int + + var ch chan int shouldPanic(func() { close(ch) }) - + ch = make(chan int) close(ch) shouldPanic(func() { diff --git a/test/closure1.go b/test/closure1.go index 586998203aa77..ff78f8af8f20f 100644 --- a/test/closure1.go +++ b/test/closure1.go @@ -16,4 +16,4 @@ func main() { panic("x != 1") } }() -} \ No newline at end of file +} diff --git a/test/closure2.go b/test/closure2.go index 4d61b45d3f42f..3254775fcc1a1 100644 --- a/test/closure2.go +++ b/test/closure2.go @@ -90,7 +90,7 @@ func main() { q++ g = func() int { return q // test that we capture by ref here - // q++ must on a different decldepth than q declaration + // q++ must on a different decldepth than q declaration } } if g() != 2 { @@ -108,7 +108,7 @@ func main() { }()] = range [2]int{} { g = func() int { return q // test that we capture by ref here - // q++ must on a different decldepth than q declaration + // q++ must on a different decldepth than q declaration } } if g() != 2 { diff --git a/test/cmplxdivide1.go b/test/cmplxdivide1.go index a52fb6fbcf706..eac84d763d45b 100644 --- a/test/cmplxdivide1.go +++ b/test/cmplxdivide1.go @@ -6,9 +6,9 @@ package main import "math" var ( - nan = math.NaN() - inf = math.Inf(1) - zero = 0.0 + nan = math.NaN() + inf = math.Inf(1) + zero = 0.0 ) var tests = []struct { diff --git a/test/codegen/copy.go b/test/codegen/copy.go index 5c3837bc7c337..5b369a3114cad 100644 --- a/test/codegen/copy.go +++ b/test/codegen/copy.go @@ -44,7 +44,7 @@ func moveDisjointStack() { runtime.KeepAlive(&s) } -func moveDisjointArg(b *[256]byte) { +func moveDisjointArg(b *[256]byte) { var s [256]byte // s390x:-".*memmove" copy(s[:], b[:]) diff --git a/test/codegen/shift.go b/test/codegen/shift.go index 93fa828868c82..1e145d374892e 100644 --- a/test/codegen/shift.go +++ b/test/codegen/shift.go @@ -12,47 +12,47 @@ package codegen func lshMask64x64(v int64, s uint64) int64 { // s390x:-".*AND",-".*MOVDGE" - return v << (s&63) + return v << (s & 63) } func rshMask64Ux64(v uint64, s uint64) uint64 { // s390x:-".*AND",-".*MOVDGE" - return v >> (s&63) + return v >> (s & 63) } func rshMask64x64(v int64, s uint64) int64 { // s390x:-".*AND",-".*MOVDGE" - return v >> (s&63) + return v >> (s & 63) } func lshMask32x64(v int32, s uint64) int32 { // s390x:-".*AND",-".*MOVDGE" - return v << (s&63) + return v << (s & 63) } func rshMask32Ux64(v uint32, s uint64) uint32 { // s390x:-".*AND",-".*MOVDGE" - return v >> (s&63) + return v >> (s & 63) } func rshMask32x64(v int32, s uint64) int32 { // s390x:-".*AND",-".*MOVDGE" - return v >> (s&63) + return v >> (s & 63) } func lshMask64x32(v int64, s uint32) int64 { // s390x:-".*AND",-".*MOVDGE" - return v << (s&63) + return v << (s & 63) } func rshMask64Ux32(v uint64, s uint32) uint64 { // s390x:-".*AND",-".*MOVDGE" - return v >> (s&63) + return v >> (s & 63) } func rshMask64x32(v int64, s uint32) int64 { // s390x:-".*AND",-".*MOVDGE" - return v >> (s&63) + return v >> (s & 63) } func lshMask64x32Ext(v int64, s int32) int64 { diff --git a/test/complit1.go b/test/complit1.go index 83695a9e88c02..3c01fe95cb99d 100644 --- a/test/complit1.go +++ b/test/complit1.go @@ -53,13 +53,13 @@ var ( type M map[T]T var ( - _ = M{{i:1}: {i:2}} - _ = M{T{i:1}: {i:2}} - _ = M{{i:1}: T{i:2}} - _ = M{T{i:1}: T{i:2}} + _ = M{{i: 1}: {i: 2}} + _ = M{T{i: 1}: {i: 2}} + _ = M{{i: 1}: T{i: 2}} + _ = M{T{i: 1}: T{i: 2}} ) -type S struct { s [1]*M1 } +type S struct{ s [1]*M1 } type M1 map[S]int -var _ = M1{{s:[1]*M1{&M1{{}:1}}}:2} +var _ = M1{{s: [1]*M1{&M1{{}: 1}}}: 2} diff --git a/test/const1.go b/test/const1.go index 62abe4145ad1f..a588912af77fb 100644 --- a/test/const1.go +++ b/test/const1.go @@ -87,8 +87,8 @@ func main() { f(Bool) // ERROR "convert|wrong type|cannot|incompatible" } -const ptr = nil // ERROR "const.*nil" -const _ = string([]byte(nil)) // ERROR "is not a? ?constant" +const ptr = nil // ERROR "const.*nil" +const _ = string([]byte(nil)) // ERROR "is not a? ?constant" const _ = uintptr(unsafe.Pointer((*int)(nil))) // ERROR "is not a? ?constant" -const _ = unsafe.Pointer((*int)(nil)) // ERROR "cannot be nil|invalid constant type|is not a constant" -const _ = (*int)(nil) // ERROR "cannot be nil|invalid constant type|is not a constant" +const _ = unsafe.Pointer((*int)(nil)) // ERROR "cannot be nil|invalid constant type|is not a constant" +const _ = (*int)(nil) // ERROR "cannot be nil|invalid constant type|is not a constant" diff --git a/test/const3.go b/test/const3.go index 3f4e3d1ae6fa9..28cce0e6d6728 100644 --- a/test/const3.go +++ b/test/const3.go @@ -29,7 +29,7 @@ func main() { panic("fail") } x := uint(5) - y := float64(uint64(1)<>= 1 } - return q, x + return q, x } // signed divide and mod: do unsigned and adjust signs. diff --git a/test/dwarf/dwarf.dir/main.go b/test/dwarf/dwarf.dir/main.go index 175a09c779973..732be1c180b48 100644 --- a/test/dwarf/dwarf.dir/main.go +++ b/test/dwarf/dwarf.dir/main.go @@ -8,25 +8,26 @@ // license that can be found in the LICENSE file. package main + func main() { -F1() -F2() -F3() -F4() -F5() -F6() -F7() -F8() -F9() -F10() -F11() -F12() -F13() -F14() -F15() -F16() -F17() -F18() -F19() -F20() + F1() + F2() + F3() + F4() + F5() + F6() + F7() + F8() + F9() + F10() + F11() + F12() + F13() + F14() + F15() + F16() + F17() + F18() + F19() + F20() } diff --git a/test/dwarf/dwarf.dir/z1.go b/test/dwarf/dwarf.dir/z1.go index 7f163e9a1d97c..1cda10aa65bf7 100644 --- a/test/dwarf/dwarf.dir/z1.go +++ b/test/dwarf/dwarf.dir/z1.go @@ -1,5 +1,4 @@ - - //line x1.go:4 package main + func F1() {} diff --git a/test/dwarf/dwarf.dir/z10.go b/test/dwarf/dwarf.dir/z10.go index 19c70020e0ca3..1217cbffd84d1 100644 --- a/test/dwarf/dwarf.dir/z10.go +++ b/test/dwarf/dwarf.dir/z10.go @@ -1,6 +1,4 @@ - - - //line x10.go:4 package main + func F10() {} diff --git a/test/dwarf/dwarf.dir/z11.go b/test/dwarf/dwarf.dir/z11.go index c1d2f9180f117..c0350e2e9da8c 100644 --- a/test/dwarf/dwarf.dir/z11.go +++ b/test/dwarf/dwarf.dir/z11.go @@ -1,4 +1,4 @@ - //line x11.go:4 package main + func F11() {} diff --git a/test/dwarf/dwarf.dir/z12.go b/test/dwarf/dwarf.dir/z12.go index 7455f18946826..07d8fde60fc3c 100644 --- a/test/dwarf/dwarf.dir/z12.go +++ b/test/dwarf/dwarf.dir/z12.go @@ -1,4 +1,4 @@ - //line x12.go:4 package main + func F12() {} diff --git a/test/dwarf/dwarf.dir/z13.go b/test/dwarf/dwarf.dir/z13.go index ecb3c4c8c711d..2986c6ba1ab9e 100644 --- a/test/dwarf/dwarf.dir/z13.go +++ b/test/dwarf/dwarf.dir/z13.go @@ -1,4 +1,4 @@ - //line x13.go:4 package main + func F13() {} diff --git a/test/dwarf/dwarf.dir/z14.go b/test/dwarf/dwarf.dir/z14.go index 134b39b64e2bd..742e1eecf1a75 100644 --- a/test/dwarf/dwarf.dir/z14.go +++ b/test/dwarf/dwarf.dir/z14.go @@ -1,4 +1,4 @@ - //line x14.go:4 package main + func F14() {} diff --git a/test/dwarf/dwarf.dir/z15.go b/test/dwarf/dwarf.dir/z15.go index d73819b443ba1..971ad7e8bfe1a 100644 --- a/test/dwarf/dwarf.dir/z15.go +++ b/test/dwarf/dwarf.dir/z15.go @@ -1,4 +1,4 @@ - //line x15.go:4 package main + func F15() {} diff --git a/test/dwarf/dwarf.dir/z16.go b/test/dwarf/dwarf.dir/z16.go index 6c31651baa891..3a00057740ca8 100644 --- a/test/dwarf/dwarf.dir/z16.go +++ b/test/dwarf/dwarf.dir/z16.go @@ -1,4 +1,4 @@ - //line x16.go:4 package main + func F16() {} diff --git a/test/dwarf/dwarf.dir/z17.go b/test/dwarf/dwarf.dir/z17.go index b742d1672606c..d5fbd62531662 100644 --- a/test/dwarf/dwarf.dir/z17.go +++ b/test/dwarf/dwarf.dir/z17.go @@ -1,4 +1,4 @@ - //line x17.go:4 package main + func F17() {} diff --git a/test/dwarf/dwarf.dir/z18.go b/test/dwarf/dwarf.dir/z18.go index 84150ff0a3556..16750d9f37181 100644 --- a/test/dwarf/dwarf.dir/z18.go +++ b/test/dwarf/dwarf.dir/z18.go @@ -1,5 +1,4 @@ - - //line x18.go:4 package main + func F18() {} diff --git a/test/dwarf/dwarf.dir/z19.go b/test/dwarf/dwarf.dir/z19.go index bb2e29684174f..ae57364790611 100644 --- a/test/dwarf/dwarf.dir/z19.go +++ b/test/dwarf/dwarf.dir/z19.go @@ -1,4 +1,4 @@ - //line x19.go:4 package main + func F19() {} diff --git a/test/dwarf/dwarf.dir/z2.go b/test/dwarf/dwarf.dir/z2.go index 68bd58257d9a0..daba026c10c29 100644 --- a/test/dwarf/dwarf.dir/z2.go +++ b/test/dwarf/dwarf.dir/z2.go @@ -1,4 +1,4 @@ - //line x2.go:4 package main + func F2() {} diff --git a/test/dwarf/dwarf.dir/z20.go b/test/dwarf/dwarf.dir/z20.go index 03111e184521d..15ad35c3e710c 100644 --- a/test/dwarf/dwarf.dir/z20.go +++ b/test/dwarf/dwarf.dir/z20.go @@ -1,4 +1,4 @@ - //line x20.go:4 package main + func F20() {} diff --git a/test/dwarf/dwarf.dir/z3.go b/test/dwarf/dwarf.dir/z3.go index 5e4ad3ae257df..46f05b92ff9f1 100644 --- a/test/dwarf/dwarf.dir/z3.go +++ b/test/dwarf/dwarf.dir/z3.go @@ -1,4 +1,4 @@ - //line x3.go:4 package main + func F3() {} diff --git a/test/dwarf/dwarf.dir/z4.go b/test/dwarf/dwarf.dir/z4.go index 1f28465c57714..c3fd6e37b8b20 100644 --- a/test/dwarf/dwarf.dir/z4.go +++ b/test/dwarf/dwarf.dir/z4.go @@ -1,4 +1,4 @@ - //line x4.go:4 package main + func F4() {} diff --git a/test/dwarf/dwarf.dir/z5.go b/test/dwarf/dwarf.dir/z5.go index 7f4eeb419a35b..3b6f8b7a63990 100644 --- a/test/dwarf/dwarf.dir/z5.go +++ b/test/dwarf/dwarf.dir/z5.go @@ -1,4 +1,4 @@ - //line x5.go:4 package main + func F5() {} diff --git a/test/dwarf/dwarf.dir/z6.go b/test/dwarf/dwarf.dir/z6.go index 241791dff2b0e..d18a067aae916 100644 --- a/test/dwarf/dwarf.dir/z6.go +++ b/test/dwarf/dwarf.dir/z6.go @@ -1,4 +1,4 @@ - //line x6.go:4 package main + func F6() {} diff --git a/test/dwarf/dwarf.dir/z7.go b/test/dwarf/dwarf.dir/z7.go index 68c1ad0c2434a..10bc1a9e5697c 100644 --- a/test/dwarf/dwarf.dir/z7.go +++ b/test/dwarf/dwarf.dir/z7.go @@ -1,4 +1,4 @@ - //line x7.go:4 package main + func F7() {} diff --git a/test/dwarf/dwarf.dir/z8.go b/test/dwarf/dwarf.dir/z8.go index 16eed32a28d3c..3b17a9d88bf59 100644 --- a/test/dwarf/dwarf.dir/z8.go +++ b/test/dwarf/dwarf.dir/z8.go @@ -1,4 +1,4 @@ - //line x8.go:4 package main + func F8() {} diff --git a/test/dwarf/dwarf.dir/z9.go b/test/dwarf/dwarf.dir/z9.go index cbb94b4d2bedd..3af6b317b5746 100644 --- a/test/dwarf/dwarf.dir/z9.go +++ b/test/dwarf/dwarf.dir/z9.go @@ -1,4 +1,4 @@ - //line x9.go:4 package main + func F9() {} diff --git a/test/dwarf/linedirectives.go b/test/dwarf/linedirectives.go index cc4ffb000fd4f..4503d311845f9 100644 --- a/test/dwarf/linedirectives.go +++ b/test/dwarf/linedirectives.go @@ -6,8 +6,9 @@ //line foo/bar.y:4 package main + //line foo/bar.y:60 -func main() { +func main() { //line foo/bar.y:297 f, l := 0, 0 //line yacctab:1 @@ -38,46 +39,74 @@ func main() { l = 146 //line foo/bar.y:148 //line foo/bar.y:153 + //line foo/bar.y:155 l = 155 //line foo/bar.y:160 //line foo/bar.y:164 + //line foo/bar.y:173 //line foo/bar.y:178 + //line foo/bar.y:180 + //line foo/bar.y:185 + //line foo/bar.y:195 + //line foo/bar.y:197 + //line foo/bar.y:202 + //line foo/bar.y:204 + //line foo/bar.y:208 + //line foo/bar.y:211 + //line foo/bar.y:213 + //line foo/bar.y:215 + //line foo/bar.y:217 + //line foo/bar.y:221 + //line foo/bar.y:229 + //line foo/bar.y:236 + //line foo/bar.y:238 + //line foo/bar.y:240 + //line foo/bar.y:244 + //line foo/bar.y:249 + //line foo/bar.y:253 + //line foo/bar.y:257 + //line foo/bar.y:262 + //line foo/bar.y:267 + //line foo/bar.y:272 if l == f { //line foo/bar.y:277 - panic("aie!") + panic("aie!") //line foo/bar.y:281 } //line foo/bar.y:285 return //line foo/bar.y:288 + //line foo/bar.y:290 } + //line foo/bar.y:293 + //line foo/bar.y:295 diff --git a/test/empty.go b/test/empty.go index 92a79a4e0d802..8ac39071067d7 100644 --- a/test/empty.go +++ b/test/empty.go @@ -9,7 +9,10 @@ package P -import ( ) -const ( ) -var ( ) -type ( ) +import () + +const () + +var () + +type () diff --git a/test/eof.go b/test/eof.go index d051f33bf79db..b142dd83c93a3 100644 --- a/test/eof.go +++ b/test/eof.go @@ -9,4 +9,4 @@ // No newline at the end of this file. -package main \ No newline at end of file +package main diff --git a/test/eof1.go b/test/eof1.go index 90792ca76e100..192f207bfc807 100644 --- a/test/eof1.go +++ b/test/eof1.go @@ -9,4 +9,4 @@ package eof1 -// No newline at the end of this comment. \ No newline at end of file +// No newline at the end of this comment. diff --git a/test/escape_iface.go b/test/escape_iface.go index 8a11d7eb820db..2a3199ae5bbcb 100644 --- a/test/escape_iface.go +++ b/test/escape_iface.go @@ -235,7 +235,7 @@ func dotTypeEscape2() { // #13805, #15796 var x interface{} = i // ERROR "i does not escape" var y interface{} = j // ERROR "j does not escape" - *(&v) = x.(int) // ERROR "&v does not escape" + *(&v) = x.(int) // ERROR "&v does not escape" *(&v), *(&ok) = y.(int) // ERROR "&v does not escape" "&ok does not escape" } { @@ -245,8 +245,8 @@ func dotTypeEscape2() { // #13805, #15796 var x interface{} = i // ERROR "i does not escape" var y interface{} = j // ERROR "j does not escape" - sink = x.(int) // ERROR "x.\(int\) escapes to heap" - sink, *(&ok) = y.(int) // ERROR "&ok does not escape" + sink = x.(int) // ERROR "x.\(int\) escapes to heap" + sink, *(&ok) = y.(int) // ERROR "&ok does not escape" } { i := 0 // ERROR "moved to heap: i" @@ -255,7 +255,7 @@ func dotTypeEscape2() { // #13805, #15796 var x interface{} = &i // ERROR "&i escapes to heap" var y interface{} = &j // ERROR "&j escapes to heap" - sink = x.(*int) // ERROR "x.\(\*int\) escapes to heap" - sink, *(&ok) = y.(*int) // ERROR "&ok does not escape" + sink = x.(*int) // ERROR "x.\(\*int\) escapes to heap" + sink, *(&ok) = y.(*int) // ERROR "&ok does not escape" } } diff --git a/test/escape_map.go b/test/escape_map.go index 99cbd482a6001..44f59b38509c4 100644 --- a/test/escape_map.go +++ b/test/escape_map.go @@ -95,7 +95,7 @@ func map8() { i := 0 // ERROR "moved to heap: i" j := 0 // ERROR "moved to heap: j" m := map[*int]*int{&i: &j} // ERROR "&i escapes to heap" "&j escapes to heap" "literal escapes to heap" - sink = m // ERROR "m escapes to heap" + sink = m // ERROR "m escapes to heap" } func map9() *int { diff --git a/test/finprofiled.go b/test/finprofiled.go index 0eb801a4bde2d..267e15b9affe2 100644 --- a/test/finprofiled.go +++ b/test/finprofiled.go @@ -23,7 +23,7 @@ func main() { // only for middle bytes. The finalizer resurrects that object. // As the result, all allocated memory must stay alive. const ( - N = 1 << 20 + N = 1 << 20 tinyBlockSize = 16 // runtime._TinySize ) hold := make([]*int32, 0, N) diff --git a/test/fixedbugs/bug000.go b/test/fixedbugs/bug000.go index 9104a57aaf6e7..a0a9a654adf80 100644 --- a/test/fixedbugs/bug000.go +++ b/test/fixedbugs/bug000.go @@ -7,14 +7,16 @@ package main func main() { - var x int; + var x int switch x { case 0: - {} + { + } case 1: - x = 0; + x = 0 } } + /* bug0.go:8: case statement out of place */ diff --git a/test/fixedbugs/bug002.go b/test/fixedbugs/bug002.go index 3493426d3774d..89b989cb856cb 100644 --- a/test/fixedbugs/bug002.go +++ b/test/fixedbugs/bug002.go @@ -7,5 +7,6 @@ package main func main() { - if ; false {} // compiles; should be an error (should be simplevardecl before ;) + if false { + } // compiles; should be an error (should be simplevardecl before ;) } diff --git a/test/fixedbugs/bug003.go b/test/fixedbugs/bug003.go index 7165d9d2099f7..1602630c39294 100644 --- a/test/fixedbugs/bug003.go +++ b/test/fixedbugs/bug003.go @@ -7,8 +7,14 @@ package main func main() { - switch ; { case true: return; default: return } + switch { + case true: + return + default: + return + } } + /* bug003.go:6: fatal error: walkswitch: not case EMPTY */ diff --git a/test/fixedbugs/bug004.go b/test/fixedbugs/bug004.go index fb207e9bc8e64..4864afacb6e84 100644 --- a/test/fixedbugs/bug004.go +++ b/test/fixedbugs/bug004.go @@ -7,5 +7,8 @@ package main func main() { - switch ; { case false: return; } // compiles; should be an error (should be simplevardecl before ;) + switch { + case false: + return + } // compiles; should be an error (should be simplevardecl before ;) } diff --git a/test/fixedbugs/bug005.go b/test/fixedbugs/bug005.go index 3798f8321a123..d57ef6ac2df7b 100644 --- a/test/fixedbugs/bug005.go +++ b/test/fixedbugs/bug005.go @@ -7,11 +7,13 @@ package main func main() { - Foo: { - return; +Foo: + { + return } - goto Foo; + goto Foo } + /* bug5.go:4: Foo undefined bug5.go:4: fatal error: walktype: switch 1 unknown op GOTO l(4) diff --git a/test/fixedbugs/bug008.go b/test/fixedbugs/bug008.go index 48f74a52d9596..4468d74a207a6 100644 --- a/test/fixedbugs/bug008.go +++ b/test/fixedbugs/bug008.go @@ -7,14 +7,21 @@ package main func main() { - i5 := 5; + i5 := 5 - switch { // compiler crash fixable with 'switch true' - case i5 < 5: dummy := 0; _ = dummy; - case i5 == 5: dummy := 0; _ = dummy; - case i5 > 5: dummy := 0; _ = dummy; + switch { // compiler crash fixable with 'switch true' + case i5 < 5: + dummy := 0 + _ = dummy + case i5 == 5: + dummy := 0 + _ = dummy + case i5 > 5: + dummy := 0 + _ = dummy } } + /* Segmentation fault */ diff --git a/test/fixedbugs/bug009.go b/test/fixedbugs/bug009.go index 0467b297a2cb5..3db245e64e237 100644 --- a/test/fixedbugs/bug009.go +++ b/test/fixedbugs/bug009.go @@ -6,10 +6,11 @@ package main - func main() { - fired := false; _ = fired; + fired := false + _ = fired } + /* bug9.go:5: defaultlit: unknown literal: LITERAL-B0 a(1) bug9.go:5: fatal error: addvar: n=NAME-fired G0 a(1) l(5) t= nil diff --git a/test/fixedbugs/bug010.go b/test/fixedbugs/bug010.go index f54b1d54a861c..a8d3ed4cbb9de 100644 --- a/test/fixedbugs/bug010.go +++ b/test/fixedbugs/bug010.go @@ -6,7 +6,6 @@ package main - func f(i int, f float64) { i = 8 f = 8.0 diff --git a/test/fixedbugs/bug011.go b/test/fixedbugs/bug011.go index 519c3585f06ba..95c91a1ff98a3 100644 --- a/test/fixedbugs/bug011.go +++ b/test/fixedbugs/bug011.go @@ -6,7 +6,6 @@ package main - type T struct { x, y int } @@ -22,6 +21,7 @@ func main() { r10 := t.m(1, 3.0) _ = r10 } + /* bug11.go:16: fatal error: walktype: switch 1 unknown op CALLMETH l(16) INT32 */ diff --git a/test/fixedbugs/bug012.go b/test/fixedbugs/bug012.go index 38efb6d979225..d4ccc973a53bb 100644 --- a/test/fixedbugs/bug012.go +++ b/test/fixedbugs/bug012.go @@ -6,18 +6,24 @@ package main - func main() { - var u30 uint64 = 0; - var u31 uint64 = 1; - _, _ = u30, u31; - var u32 uint64 = 18446744073709551615; - var u33 uint64 = +18446744073709551615; - if u32 != (1<<64)-1 { panic("u32\n"); } - if u33 != (1<<64)-1 { panic("u33\n"); } - var i34 int64 = ^0; // note: 2's complement means ^0 == -1 - if i34 != -1 { panic("i34") } + var u30 uint64 = 0 + var u31 uint64 = 1 + _, _ = u30, u31 + var u32 uint64 = 18446744073709551615 + var u33 uint64 = +18446744073709551615 + if u32 != (1<<64)-1 { + panic("u32\n") + } + if u33 != (1<<64)-1 { + panic("u33\n") + } + var i34 int64 = ^0 // note: 2's complement means ^0 == -1 + if i34 != -1 { + panic("i34") + } } + /* bug12.go:5: overflow converting constant to UINT64 bug12.go:6: overflow converting constant to UINT64 diff --git a/test/fixedbugs/bug013.go b/test/fixedbugs/bug013.go index 045786bf7a891..c80fe67c5ac8d 100644 --- a/test/fixedbugs/bug013.go +++ b/test/fixedbugs/bug013.go @@ -7,10 +7,11 @@ package main func main() { - var cu0 uint16 = '\u1234'; - var cU1 uint32 = '\U00101234'; - _, _ = cu0, cU1; + var cu0 uint16 = '\u1234' + var cU1 uint32 = '\U00101234' + _, _ = cu0, cU1 } + /* bug13.go:4: missing ' bug13.go:4: syntax error diff --git a/test/fixedbugs/bug015.go b/test/fixedbugs/bug015.go index d3a9f22ed0826..b00071e590d8c 100644 --- a/test/fixedbugs/bug015.go +++ b/test/fixedbugs/bug015.go @@ -7,7 +7,7 @@ package main func main() { - var i33 int64; - if i33 == (1<<64) -1 { // ERROR "overflow" + var i33 int64 + if i33 == (1<<64)-1 { // ERROR "overflow" } } diff --git a/test/fixedbugs/bug017.go b/test/fixedbugs/bug017.go index 2f5960d10446d..62011249325a1 100644 --- a/test/fixedbugs/bug017.go +++ b/test/fixedbugs/bug017.go @@ -7,9 +7,10 @@ package main func main() { - var s2 string = "\a\b\f\n\r\t\v"; // \r is miscompiled - _ = s2; + var s2 string = "\a\b\f\n\r\t\v" // \r is miscompiled + _ = s2 } + /* main.go.c: In function ‘main_main’: main.go.c:20: error: missing terminating " character diff --git a/test/fixedbugs/bug020.go b/test/fixedbugs/bug020.go index cde3f8679bea9..1dd2106b24e09 100644 --- a/test/fixedbugs/bug020.go +++ b/test/fixedbugs/bug020.go @@ -6,10 +6,10 @@ package main -var digits string; +var digits string func putint(buf []byte, i, base, val int, digits string) { - buf[i] = digits[val]; + buf[i] = digits[val] } func main() { diff --git a/test/fixedbugs/bug021.go b/test/fixedbugs/bug021.go index bf936e875cd54..fcbebc7397fbb 100644 --- a/test/fixedbugs/bug021.go +++ b/test/fixedbugs/bug021.go @@ -7,7 +7,7 @@ package main func main() { - s1 := "hi"; - s2 := "ho"; - s1 += s2; + s1 := "hi" + s2 := "ho" + s1 += s2 } diff --git a/test/fixedbugs/bug022.go b/test/fixedbugs/bug022.go index 65a8bfe9a1989..8395ab36a1bce 100644 --- a/test/fixedbugs/bug022.go +++ b/test/fixedbugs/bug022.go @@ -7,15 +7,15 @@ package main func putint(digits *string) { - var i byte; - i = (*digits)[7]; // compiles - i = digits[7]; // ERROR "illegal|is not|invalid" - _ = i; + var i byte + i = (*digits)[7] // compiles + i = digits[7] // ERROR "illegal|is not|invalid" + _ = i } func main() { - s := "asdfasdfasdfasdf"; - putint(&s); + s := "asdfasdfasdfasdf" + putint(&s) } /* diff --git a/test/fixedbugs/bug023.go b/test/fixedbugs/bug023.go index 9b211cd54f8c2..c3c77f7243780 100644 --- a/test/fixedbugs/bug023.go +++ b/test/fixedbugs/bug023.go @@ -7,7 +7,7 @@ package main type Type interface { - TypeName() string; + TypeName() string } type TInt struct { @@ -15,14 +15,13 @@ type TInt struct { // TInt func (i *TInt) TypeName() string { - return "int"; + return "int" } - func main() { - var t Type; - t = nil; - _ = t; + var t Type + t = nil + _ = t } /* diff --git a/test/fixedbugs/bug024.go b/test/fixedbugs/bug024.go index 2e235b7b46b08..6e3af02f2c240 100644 --- a/test/fixedbugs/bug024.go +++ b/test/fixedbugs/bug024.go @@ -7,13 +7,14 @@ package main func main() { - var i int; - i = '\''; - i = '\\'; - var s string; - s = "\""; - _, _ = i, s; + var i int + i = '\'' + i = '\\' + var s string + s = "\"" + _, _ = i, s } + /* bug.go:5: unknown escape sequence: ' bug.go:6: unknown escape sequence: \ diff --git a/test/fixedbugs/bug026.go b/test/fixedbugs/bug026.go index bfd03cc9555cd..edb2b5685ee83 100644 --- a/test/fixedbugs/bug026.go +++ b/test/fixedbugs/bug026.go @@ -15,12 +15,12 @@ type Vector struct { func (v *Vector) Insert(i int, e Element) { } - func main() { - type I struct { val int; }; // BUG: can't be local; works if global - v := new(Vector); - v.Insert(0, new(I)); + type I struct{ val int } // BUG: can't be local; works if global + v := new(Vector) + v.Insert(0, new(I)) } + /* check: main_sigs_I: not defined */ diff --git a/test/fixedbugs/bug028.go b/test/fixedbugs/bug028.go index 2edf5a9106fb1..cd41b09de3014 100644 --- a/test/fixedbugs/bug028.go +++ b/test/fixedbugs/bug028.go @@ -6,22 +6,23 @@ package main - func Alloc(i int) int { switch i { default: - return 5; + return 5 case 1: - return 1; + return 1 case 10: - return 10; + return 10 } return 0 } func main() { - s := Alloc(7); - if s != 5 { panic("bad") } + s := Alloc(7) + if s != 5 { + panic("bad") + } } /* diff --git a/test/fixedbugs/bug030.go b/test/fixedbugs/bug030.go index ffd29e057a9bb..93bb2e9e3bfaa 100644 --- a/test/fixedbugs/bug030.go +++ b/test/fixedbugs/bug030.go @@ -7,7 +7,7 @@ package main func main() { - var x int; - x := 0; // ERROR "declar|:=" - _ = x; + var x int + x := 0 // ERROR "declar|:=" + _ = x } diff --git a/test/fixedbugs/bug031.go b/test/fixedbugs/bug031.go index 529e5ce84ce83..10028c5d1d682 100644 --- a/test/fixedbugs/bug031.go +++ b/test/fixedbugs/bug031.go @@ -7,23 +7,23 @@ package main func main() { -prog := "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxx"+ -"xxxxxx"+ -"xxxxxxxxxxxxxxxxxxxx"+ -"xxxxxxxx"+ -"xxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -; -_ = prog; + prog := "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxxxxxxxxxxxxx" + + "xxxxxx" + + "xxxxxxxxxxxxxxxxxxxx" + + "xxxxxxxx" + + "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + + _ = prog } /* Segmentation fault */ diff --git a/test/fixedbugs/bug037.go b/test/fixedbugs/bug037.go index f17fb3fd74cc0..e66349a2b7021 100644 --- a/test/fixedbugs/bug037.go +++ b/test/fixedbugs/bug037.go @@ -7,5 +7,5 @@ package main func main() { - s := vlong(0); // ERROR "undef" + s := vlong(0) // ERROR "undef" } diff --git a/test/fixedbugs/bug039.go b/test/fixedbugs/bug039.go index d34f5e62e479c..847ac241db231 100644 --- a/test/fixedbugs/bug039.go +++ b/test/fixedbugs/bug039.go @@ -6,6 +6,6 @@ package main -func f (x int) { // GCCGO_ERROR "previous" - var x int; // ERROR "redecl|redefinition" +func f(x int) { // GCCGO_ERROR "previous" + var x int // ERROR "redecl|redefinition" } diff --git a/test/fixedbugs/bug040.go b/test/fixedbugs/bug040.go index d2cf88afcb24f..cb1e35f3e374e 100644 --- a/test/fixedbugs/bug040.go +++ b/test/fixedbugs/bug040.go @@ -6,6 +6,6 @@ package main -func f (x, // GCCGO_ERROR "previous" - x int) { // ERROR "duplicate argument|redefinition" +func f(x, // GCCGO_ERROR "previous" + x int) { // ERROR "duplicate argument|redefinition" } diff --git a/test/fixedbugs/bug045.go b/test/fixedbugs/bug045.go index c66a2411a8920..a15e16343efcd 100644 --- a/test/fixedbugs/bug045.go +++ b/test/fixedbugs/bug045.go @@ -11,11 +11,12 @@ type T struct { } func main() { - var ta []*T; + var ta []*T - ta = new([1]*T)[0:]; - ta[0] = nil; + ta = new([1]*T)[0:] + ta[0] = nil } + /* bug045.go:13: fatal error: goc: exit 1 */ diff --git a/test/fixedbugs/bug046.go b/test/fixedbugs/bug046.go index 219e91d537b42..2ef98177de5f3 100644 --- a/test/fixedbugs/bug046.go +++ b/test/fixedbugs/bug046.go @@ -6,9 +6,9 @@ package main -type T *struct {} +type T *struct{} -func (x T) M () {} // ERROR "pointer|receiver" +func (x T) M() {} // ERROR "pointer|receiver" /* bug046.go:7: illegal pointer diff --git a/test/fixedbugs/bug048.go b/test/fixedbugs/bug048.go index 48ad751e2c67d..112343c77f95a 100644 --- a/test/fixedbugs/bug048.go +++ b/test/fixedbugs/bug048.go @@ -7,7 +7,7 @@ package main func main() { - type M map[int] int; - m1 := M{7 : 8}; - _ = m1; + type M map[int]int + m1 := M{7: 8} + _ = m1 } diff --git a/test/fixedbugs/bug049.go b/test/fixedbugs/bug049.go index 51990f2dfbcd2..7de429c80c1ff 100644 --- a/test/fixedbugs/bug049.go +++ b/test/fixedbugs/bug049.go @@ -7,8 +7,8 @@ package main func atom(s string) { - if s == nil { // ERROR "nil|incompatible" - return; + if s == nil { // ERROR "nil|incompatible" + return } } diff --git a/test/fixedbugs/bug051.go b/test/fixedbugs/bug051.go index c4ba2eff67587..e337f960d72f8 100644 --- a/test/fixedbugs/bug051.go +++ b/test/fixedbugs/bug051.go @@ -7,9 +7,9 @@ package main func f() int { - return 0; + return 0 } func main() { - const n = f(); // ERROR "const" + const n = f() // ERROR "const" } diff --git a/test/fixedbugs/bug052.go b/test/fixedbugs/bug052.go index 440a00ebebdf3..ec372b33cc175 100644 --- a/test/fixedbugs/bug052.go +++ b/test/fixedbugs/bug052.go @@ -7,14 +7,14 @@ package main func main() { - c := 10; - d := 7; - var x [10]int; - i := 0; + c := 10 + d := 7 + var x [10]int + i := 0 /* this works: q := c/d; x[i] = q; */ // this doesn't: - x[i] = c/d; // BUG segmentation fault + x[i] = c / d // BUG segmentation fault } diff --git a/test/fixedbugs/bug053.go b/test/fixedbugs/bug053.go index 00625fd7c3043..8a8b4be5cfcfc 100644 --- a/test/fixedbugs/bug053.go +++ b/test/fixedbugs/bug053.go @@ -7,6 +7,6 @@ package main func main() { - var len int; // len should not be a keyword - this doesn't compile - _ = len; + var len int // len should not be a keyword - this doesn't compile + _ = len } diff --git a/test/fixedbugs/bug054.go b/test/fixedbugs/bug054.go index 01590585c53d6..064696bd5c4ae 100644 --- a/test/fixedbugs/bug054.go +++ b/test/fixedbugs/bug054.go @@ -10,31 +10,31 @@ type Element interface { } type Vector struct { - elem []Element; + elem []Element } func (v *Vector) At(i int) Element { - return v.elem[i]; + return v.elem[i] } type TStruct struct { - name string; - fields *Vector; + name string + fields *Vector } func (s *TStruct) field(i int) *TStruct { - return s.fields.At(i).(*TStruct); + return s.fields.At(i).(*TStruct) } func main() { - v := new(Vector); - v.elem = make([]Element, 10); - t := new(TStruct); - t.name = "hi"; - v.elem[0] = t; - s := new(TStruct); - s.name = "foo"; - s.fields = v; + v := new(Vector) + v.elem = make([]Element, 10) + t := new(TStruct) + t.name = "hi" + v.elem[0] = t + s := new(TStruct) + s.name = "foo" + s.fields = v if s.field(0).name != "hi" { panic("bad name") } diff --git a/test/fixedbugs/bug056.go b/test/fixedbugs/bug056.go index 13eac29204745..dfee21b8bf08f 100644 --- a/test/fixedbugs/bug056.go +++ b/test/fixedbugs/bug056.go @@ -11,8 +11,8 @@ func frexp() (a int, b float64) { } func main() { - a, b := frexp(); - _, _ = a, b; + a, b := frexp() + _, _ = a, b } /* diff --git a/test/fixedbugs/bug057.go b/test/fixedbugs/bug057.go index 19b8651a547b8..9df1acd0777b8 100644 --- a/test/fixedbugs/bug057.go +++ b/test/fixedbugs/bug057.go @@ -7,16 +7,15 @@ package main type T struct { - s string; + s string } - func main() { - s := ""; - l1 := len(s); - var t T; - l2 := len(t.s); // BUG: cannot take len() of a string field - _, _ = l1, l2; + s := "" + l1 := len(s) + var t T + l2 := len(t.s) // BUG: cannot take len() of a string field + _, _ = l1, l2 } /* diff --git a/test/fixedbugs/bug058.go b/test/fixedbugs/bug058.go index 2b97dbf7c0e76..ec58317ff5f9e 100644 --- a/test/fixedbugs/bug058.go +++ b/test/fixedbugs/bug058.go @@ -6,14 +6,15 @@ package main -type Box struct {}; -var m map[string] *Box; +type Box struct{} + +var m map[string]*Box func main() { - m := make(map[string] *Box); - s := "foo"; - var x *Box = nil; - m[s] = x; + m := make(map[string]*Box) + s := "foo" + var x *Box = nil + m[s] = x } /* diff --git a/test/fixedbugs/bug059.go b/test/fixedbugs/bug059.go index 6f64b9e0b16dd..4dbd297bc7013 100644 --- a/test/fixedbugs/bug059.go +++ b/test/fixedbugs/bug059.go @@ -9,28 +9,28 @@ package main import "os" func P(a []string) string { - s := "{"; + s := "{" for i := 0; i < 2; i++ { if i > 0 { s += "," } - s += `"` + a[i] + `"`; + s += `"` + a[i] + `"` } - s +="}"; - return s; + s += "}" + return s } func main() { - m := make(map[string] []string); - as := new([2]string); - as[0] = "0"; - as[1] = "1"; - m["0"] = as[0:]; + m := make(map[string][]string) + as := new([2]string) + as[0] = "0" + as[1] = "1" + m["0"] = as[0:] - a := m["0"]; - a[0] = "x"; - m["0"][0] = "deleted"; + a := m["0"] + a[0] = "x" + m["0"][0] = "deleted" if m["0"][0] != "deleted" { - os.Exit(1); + os.Exit(1) } } diff --git a/test/fixedbugs/bug060.go b/test/fixedbugs/bug060.go index 8260729056bbe..a97c1cd2fd69c 100644 --- a/test/fixedbugs/bug060.go +++ b/test/fixedbugs/bug060.go @@ -9,11 +9,11 @@ package main import "os" func main() { - m := make(map[int]int); - m[0] = 0; - m[0]++; + m := make(map[int]int) + m[0] = 0 + m[0]++ if m[0] != 1 { - print("map does not increment\n"); + print("map does not increment\n") os.Exit(1) } } diff --git a/test/fixedbugs/bug061.go b/test/fixedbugs/bug061.go index ae99b186d8137..295d6f3b45315 100644 --- a/test/fixedbugs/bug061.go +++ b/test/fixedbugs/bug061.go @@ -7,9 +7,9 @@ package main func main() { - var s string; - s = "0000000000000000000000000000000000000000000000000000000000"[0:7]; - _ = s; + var s string + s = "0000000000000000000000000000000000000000000000000000000000"[0:7] + _ = s } /* diff --git a/test/fixedbugs/bug062.go b/test/fixedbugs/bug062.go index 1cc50036559d6..1008f1af9ceca 100644 --- a/test/fixedbugs/bug062.go +++ b/test/fixedbugs/bug062.go @@ -7,5 +7,5 @@ package main func main() { - var s string = nil; // ERROR "illegal|invalid|incompatible|cannot" + var s string = nil // ERROR "illegal|invalid|incompatible|cannot" } diff --git a/test/fixedbugs/bug063.go b/test/fixedbugs/bug063.go index a3ae3f0962074..8e586ac7817a0 100644 --- a/test/fixedbugs/bug063.go +++ b/test/fixedbugs/bug063.go @@ -5,4 +5,5 @@ // license that can be found in the LICENSE file. package bug063 + const c = 0 ^ 0 diff --git a/test/fixedbugs/bug064.go b/test/fixedbugs/bug064.go index d8b3bea9a6087..b186bfe6b504e 100644 --- a/test/fixedbugs/bug064.go +++ b/test/fixedbugs/bug064.go @@ -6,17 +6,15 @@ package main -func -swap(x, y int) (u, v int) { +func swap(x, y int) (u, v int) { return y, x } -func -main() { - a := 1; - b := 2; - a, b = swap(swap(a, b)); +func main() { + a := 1 + b := 2 + a, b = swap(swap(a, b)) if a != 2 || b != 1 { - panic("bad swap"); + panic("bad swap") } } diff --git a/test/fixedbugs/bug065.go b/test/fixedbugs/bug065.go index a1e3b08bbaed6..78b98d9621403 100644 --- a/test/fixedbugs/bug065.go +++ b/test/fixedbugs/bug065.go @@ -7,6 +7,6 @@ package main func main() { - k, l, m := 0,0,0; - _, _, _ = k, l, m; + k, l, m := 0, 0, 0 + _, _, _ = k, l, m } diff --git a/test/fixedbugs/bug066.go b/test/fixedbugs/bug066.go index db3d7f86028bf..0d43d4c910107 100644 --- a/test/fixedbugs/bug066.go +++ b/test/fixedbugs/bug066.go @@ -7,20 +7,17 @@ package bug066 type Scope struct { - entries map[string] *Object; + entries map[string]*Object } - type Type struct { - scope *Scope; + scope *Scope } - type Object struct { - typ *Type; + typ *Type } - func Lookup(scope *Scope) *Object { - return scope.entries["foo"]; + return scope.entries["foo"] } diff --git a/test/fixedbugs/bug067.go b/test/fixedbugs/bug067.go index aaeefb0ba16fa..f1aadb7c6408d 100644 --- a/test/fixedbugs/bug067.go +++ b/test/fixedbugs/bug067.go @@ -9,7 +9,7 @@ package main var c chan int func main() { - c = make(chan int); - go func() { c <- 0 } (); + c = make(chan int) + go func() { c <- 0 }() <-c } diff --git a/test/fixedbugs/bug069.go b/test/fixedbugs/bug069.go index 7b07b773d4bb1..4dff02f474496 100644 --- a/test/fixedbugs/bug069.go +++ b/test/fixedbugs/bug069.go @@ -7,14 +7,14 @@ package main func main() { - c := make(chan int); - ok := false; - var i int; - - i, ok = <-c; // works - _, _ = i, ok; - - ca := new([2]chan int); - i, ok = <-(ca[0]); // fails: c.go:11: bad shape across assignment - cr=1 cl=2 - _, _ = i, ok; + c := make(chan int) + ok := false + var i int + + i, ok = <-c // works + _, _ = i, ok + + ca := new([2]chan int) + i, ok = <-(ca[0]) // fails: c.go:11: bad shape across assignment - cr=1 cl=2 + _, _ = i, ok } diff --git a/test/fixedbugs/bug071.go b/test/fixedbugs/bug071.go index ec38f7a9799cd..caae01c6ec95f 100644 --- a/test/fixedbugs/bug071.go +++ b/test/fixedbugs/bug071.go @@ -6,18 +6,18 @@ package bug071 -type rat struct { - den int; +type rat struct { + den int } func (u *rat) pr() { } type dch struct { - dat chan *rat; + dat chan *rat } -func dosplit(in *dch){ - dat := <-in.dat; - _ = dat; +func dosplit(in *dch) { + dat := <-in.dat + _ = dat } diff --git a/test/fixedbugs/bug072.go b/test/fixedbugs/bug072.go index 05ad93dac2ded..b6f46045b2b5e 100644 --- a/test/fixedbugs/bug072.go +++ b/test/fixedbugs/bug072.go @@ -7,5 +7,5 @@ package main func main() { - s := string(bug); // ERROR "undef" + s := string(bug) // ERROR "undef" } diff --git a/test/fixedbugs/bug073.go b/test/fixedbugs/bug073.go index 49b47ae464915..a4cb715a5eb96 100644 --- a/test/fixedbugs/bug073.go +++ b/test/fixedbugs/bug073.go @@ -7,8 +7,8 @@ package main func main() { - var s int = 0; - var x int = 0; - x = x << s; // ERROR "illegal|inval|shift" - x = x >> s; // ERROR "illegal|inval|shift" + var s int = 0 + var x int = 0 + x = x << s // ERROR "illegal|inval|shift" + x = x >> s // ERROR "illegal|inval|shift" } diff --git a/test/fixedbugs/bug074.go b/test/fixedbugs/bug074.go index fb789cb4c1b51..e632e9bf4eb9e 100644 --- a/test/fixedbugs/bug074.go +++ b/test/fixedbugs/bug074.go @@ -7,6 +7,6 @@ package main func main() { - x := string{'a', 'b', '\n'}; // ERROR "composite" - print(x); + x := string{'a', 'b', '\n'} // ERROR "composite" + print(x) } diff --git a/test/fixedbugs/bug075.go b/test/fixedbugs/bug075.go index d0b7d14e71bd7..a568b5fa70875 100644 --- a/test/fixedbugs/bug075.go +++ b/test/fixedbugs/bug075.go @@ -6,12 +6,13 @@ package main -type T struct { m map[int]int } +type T struct{ m map[int]int } + func main() { - t := new(T); - t.m = make(map[int]int); - var x int; - var ok bool; - x, ok = t.m[0]; //bug075.go:11: bad shape across assignment - cr=1 cl=2 - _, _ = x, ok; + t := new(T) + t.m = make(map[int]int) + var x int + var ok bool + x, ok = t.m[0] //bug075.go:11: bad shape across assignment - cr=1 cl=2 + _, _ = x, ok } diff --git a/test/fixedbugs/bug076.go b/test/fixedbugs/bug076.go index 60aaa97608335..57401318c0012 100644 --- a/test/fixedbugs/bug076.go +++ b/test/fixedbugs/bug076.go @@ -12,7 +12,6 @@ exit: goto exit } - func main() { exit: ; // this should be legal (labels not properly scoped?) @@ -20,6 +19,6 @@ exit: } /* -uetli:~/Source/go/test/bugs gri$ 6g bug076.go +uetli:~/Source/go/test/bugs gri$ 6g bug076.go bug076.go:11: label redeclared: exit */ diff --git a/test/fixedbugs/bug078.go b/test/fixedbugs/bug078.go index 1041b858c84ac..2a191dc24e8ab 100644 --- a/test/fixedbugs/bug078.go +++ b/test/fixedbugs/bug078.go @@ -6,7 +6,7 @@ package main -func dosplit(wait chan int ){ +func dosplit(wait chan int) { select { case <-wait: } diff --git a/test/fixedbugs/bug083.dir/bug1.go b/test/fixedbugs/bug083.dir/bug1.go index ea5bcfe205ad5..778688e0722fd 100644 --- a/test/fixedbugs/bug083.dir/bug1.go +++ b/test/fixedbugs/bug083.dir/bug1.go @@ -10,5 +10,4 @@ import "./bug0" // visible here in package bug1. The test for failure is in // ../bug083.go. -var v1 bug0.t0; // ERROR "bug0" - +var v1 bug0.t0 // ERROR "bug0" diff --git a/test/fixedbugs/bug085.go b/test/fixedbugs/bug085.go index dae83f8a498bd..6182c6a645e1d 100644 --- a/test/fixedbugs/bug085.go +++ b/test/fixedbugs/bug085.go @@ -9,7 +9,7 @@ package P var x int func foo() { - print(P.x); // ERROR "undefined" + print(P.x) // ERROR "undefined" } /* diff --git a/test/fixedbugs/bug086.go b/test/fixedbugs/bug086.go index 40d2362066960..97aaa60f91c8b 100644 --- a/test/fixedbugs/bug086.go +++ b/test/fixedbugs/bug086.go @@ -8,13 +8,13 @@ package main func f() int { if false { - return 0; + return 0 } // we should not be able to return successfully w/o a return statement } // ERROR "return" func main() { - print(f(), "\n"); + print(f(), "\n") } /* diff --git a/test/fixedbugs/bug087.go b/test/fixedbugs/bug087.go index 67e7210cdb38b..a973f8b34877f 100644 --- a/test/fixedbugs/bug087.go +++ b/test/fixedbugs/bug087.go @@ -6,11 +6,11 @@ package main -const s string = "foo"; +const s string = "foo" func main() { - i := len(s); // should be legal to take len() of a constant - _ = i; + i := len(s) // should be legal to take len() of a constant + _ = i } /* diff --git a/test/fixedbugs/bug088.dir/bug0.go b/test/fixedbugs/bug088.dir/bug0.go index 7a6e34747f660..8bfda6a279d26 100644 --- a/test/fixedbugs/bug088.dir/bug0.go +++ b/test/fixedbugs/bug088.dir/bug0.go @@ -4,6 +4,6 @@ package bug0 -var V0 func() int; -var V1 func() (a int); -var V2 func() (a, b int); +var V0 func() int +var V1 func() (a int) +var V2 func() (a, b int) diff --git a/test/fixedbugs/bug088.dir/bug1.go b/test/fixedbugs/bug088.dir/bug1.go index 2568e37d0209c..98a4e7cfe47ca 100644 --- a/test/fixedbugs/bug088.dir/bug1.go +++ b/test/fixedbugs/bug088.dir/bug1.go @@ -7,10 +7,10 @@ package main import P "./bug0" func main() { - a0 := P.V0(); // works - a1 := P.V1(); // works - a2, b2 := P.V2(); // doesn't work - _, _, _, _ = a0, a1, a2, b2; + a0 := P.V0() // works + a1 := P.V1() // works + a2, b2 := P.V2() // doesn't work + _, _, _, _ = a0, a1, a2, b2 } /* diff --git a/test/fixedbugs/bug089.go b/test/fixedbugs/bug089.go index e88f17babb808..e1a87801f0d93 100644 --- a/test/fixedbugs/bug089.go +++ b/test/fixedbugs/bug089.go @@ -6,16 +6,15 @@ package main -type I1 interface {} -type I2 interface { pr() } +type I1 interface{} +type I2 interface{ pr() } -func e() I1; +func e() I1 -var i1 I1; -var i2 I2; +var i1 I1 +var i2 I2 -func -main() { +func main() { - i2 = e().(I2); // bug089.go:16: fatal error: agen_inter i2i + i2 = e().(I2) // bug089.go:16: fatal error: agen_inter i2i } diff --git a/test/fixedbugs/bug090.go b/test/fixedbugs/bug090.go index 320bd57f5c17f..d074b30880153 100644 --- a/test/fixedbugs/bug090.go +++ b/test/fixedbugs/bug090.go @@ -7,8 +7,8 @@ package main const ( - c3div2 = 3/2; - f3div2 = 3./2.; + c3div2 = 3 / 2 + f3div2 = 3. / 2. ) func assert(t bool, s string) { @@ -18,29 +18,29 @@ func assert(t bool, s string) { } func main() { - var i int; - var f float64; + var i int + var f float64 - assert(c3div2 == 1, "3/2"); - assert(f3div2 == 1.5, "3/2"); + assert(c3div2 == 1, "3/2") + assert(f3div2 == 1.5, "3/2") - i = c3div2; - assert(i == c3div2, "i == c3div2"); + i = c3div2 + assert(i == c3div2, "i == c3div2") - f = c3div2; - assert(f == c3div2, "f == c3div2"); + f = c3div2 + assert(f == c3div2, "f == c3div2") - f = f3div2; - assert(f == f3div2, "f == f3div2"); + f = f3div2 + assert(f == f3div2, "f == f3div2") - i = f3div2; // ERROR "truncate" - assert(i == c3div2, "i == c3div2 from f3div2"); - assert(i != f3div2, "i != f3div2"); // ERROR "truncate" + i = f3div2 // ERROR "truncate" + assert(i == c3div2, "i == c3div2 from f3div2") + assert(i != f3div2, "i != f3div2") // ERROR "truncate" - const g float64 = 1.0; - i = g; // ERROR "convert|incompatible|cannot" + const g float64 = 1.0 + i = g // ERROR "convert|incompatible|cannot" - const h float64 = 3.14; - i = h; // ERROR "convert|incompatible|cannot" - i = int(h); // ERROR "truncate" + const h float64 = 3.14 + i = h // ERROR "convert|incompatible|cannot" + i = int(h) // ERROR "truncate" } diff --git a/test/fixedbugs/bug092.go b/test/fixedbugs/bug092.go index 8027d941ea485..b34969afd301e 100644 --- a/test/fixedbugs/bug092.go +++ b/test/fixedbugs/bug092.go @@ -7,9 +7,9 @@ package main func main() { - var a [1000] int64; // this alone works - var b [10000] int64; // this causes a runtime crash - _, _ = a, b; + var a [1000]int64 // this alone works + var b [10000]int64 // this causes a runtime crash + _, _ = a, b } /* diff --git a/test/fixedbugs/bug093.go b/test/fixedbugs/bug093.go index acd94466f599f..a3a626a1b0599 100644 --- a/test/fixedbugs/bug093.go +++ b/test/fixedbugs/bug093.go @@ -13,16 +13,15 @@ func (p *S) M() { } type I interface { - M(); + M() } func main() { - var p *S = nil; - var i I = p; // this should be possible even though p is nil: we still know the type - i.M(); // should be possible since we know the type, and don't ever use the receiver + var p *S = nil + var i I = p // this should be possible even though p is nil: we still know the type + i.M() // should be possible since we know the type, and don't ever use the receiver } - /* throw: ifaces2i: nil pointer SIGSEGV: segmentation violation diff --git a/test/fixedbugs/bug094.go b/test/fixedbugs/bug094.go index 3ef11da3d3a24..4456237302e52 100644 --- a/test/fixedbugs/bug094.go +++ b/test/fixedbugs/bug094.go @@ -7,19 +7,17 @@ package main func f0() { - const x = 0; + const x = 0 } - func f1() { - x := 0; - _ = x; + x := 0 + _ = x } - func main() { - f0(); - f1(); + f0() + f1() } /* diff --git a/test/fixedbugs/bug096.go b/test/fixedbugs/bug096.go index 411ba74e0caed..39ce017bb7199 100644 --- a/test/fixedbugs/bug096.go +++ b/test/fixedbugs/bug096.go @@ -6,12 +6,12 @@ package main -type A []int; +type A []int func main() { - a := &A{0}; - b := &A{0, 1}; - _, _ = a, b; + a := &A{0} + b := &A{0, 1} + _, _ = a, b } /* diff --git a/test/fixedbugs/bug098.go b/test/fixedbugs/bug098.go index eb4ee4de03fef..b872b50fa7e05 100644 --- a/test/fixedbugs/bug098.go +++ b/test/fixedbugs/bug098.go @@ -6,13 +6,13 @@ package main -type A []int; -type M map[int] int; +type A []int +type M map[int]int func main() { - var a *A = &A{0}; - var m *M = &M{0 : 0}; // should be legal to use & here for consistency with other composite constructors (prev. line) - _, _ = a, m; + var a *A = &A{0} + var m *M = &M{0: 0} // should be legal to use & here for consistency with other composite constructors (prev. line) + _, _ = a, m } /* diff --git a/test/fixedbugs/bug099.go b/test/fixedbugs/bug099.go index 03a5c454b0b17..51b667bca80cf 100644 --- a/test/fixedbugs/bug099.go +++ b/test/fixedbugs/bug099.go @@ -7,10 +7,11 @@ package main // Interface -type I interface { F() int } +type I interface{ F() int } // Implements interface -type S struct { } +type S struct{} + func (s *S) F() int { return 1 } // Allocates S but returns I @@ -27,11 +28,10 @@ func Use(x I) { } func main() { - i := NewI(0); - Use(i); + i := NewI(0) + Use(i) // Again, without temporary // Crashes because x.F is 0. - Use(NewI(0)); + Use(NewI(0)) } - diff --git a/test/fixedbugs/bug101.go b/test/fixedbugs/bug101.go index 82e496a8a6ae2..5afc4b6ddaa49 100644 --- a/test/fixedbugs/bug101.go +++ b/test/fixedbugs/bug101.go @@ -6,10 +6,14 @@ package main -var a = []int { 1, 2, 3 } +var a = []int{1, 2, 3} func main() { - if len(a) != 3 { panic("array len") } + if len(a) != 3 { + panic("array len") + } // print(a[0], " ", a[1], " ", a[2], "\n") - if a[0] != 1 || a[1] != 2 || a[2] != 3 { panic("array contents") } + if a[0] != 1 || a[1] != 2 || a[2] != 3 { + panic("array contents") + } } diff --git a/test/fixedbugs/bug103.go b/test/fixedbugs/bug103.go index 1cb710e36887f..c79ebf25cb879 100644 --- a/test/fixedbugs/bug103.go +++ b/test/fixedbugs/bug103.go @@ -6,9 +6,8 @@ package main -func f() /* no return type */ {} +func f()/* no return type */ {} func main() { - x := f(); // ERROR "mismatch|as value|no type" + x := f() // ERROR "mismatch|as value|no type" } - diff --git a/test/fixedbugs/bug104.go b/test/fixedbugs/bug104.go index f0c19a8aa7528..0e32d94262bf5 100644 --- a/test/fixedbugs/bug104.go +++ b/test/fixedbugs/bug104.go @@ -5,6 +5,7 @@ // license that can be found in the LICENSE file. package main + func f() string { - return 0 // ERROR "conversion|type" + return 0 // ERROR "conversion|type" } diff --git a/test/fixedbugs/bug106.dir/bug1.go b/test/fixedbugs/bug106.dir/bug1.go index eff0d36ed2953..eae2abbbaa1dc 100644 --- a/test/fixedbugs/bug106.dir/bug1.go +++ b/test/fixedbugs/bug106.dir/bug1.go @@ -5,4 +5,3 @@ package bug1 import _ "./bug0" - diff --git a/test/fixedbugs/bug107.go b/test/fixedbugs/bug107.go index dcd8e9d1138f4..198a1f40f3bbc 100644 --- a/test/fixedbugs/bug107.go +++ b/test/fixedbugs/bug107.go @@ -5,11 +5,14 @@ // license that can be found in the LICENSE file. package main + import os "os" + type _ os.FileInfo + func f() (os int) { - // In the next line "os" should refer to the result variable, not - // to the package. - v := os.Open("", 0, 0); // ERROR "undefined" - return 0 + // In the next line "os" should refer to the result variable, not + // to the package. + v := os.Open("", 0, 0) // ERROR "undefined" + return 0 } diff --git a/test/fixedbugs/bug108.go b/test/fixedbugs/bug108.go index cfec4c9f1f471..a0f979c3ea01b 100644 --- a/test/fixedbugs/bug108.go +++ b/test/fixedbugs/bug108.go @@ -5,7 +5,8 @@ // license that can be found in the LICENSE file. package main + func f() { - v := 1 << 1025; // ERROR "overflow|shift count too large" + v := 1 << 1025 // ERROR "overflow|shift count too large" _ = v } diff --git a/test/fixedbugs/bug111.go b/test/fixedbugs/bug111.go index d977bd54fb124..c30afbb6d2f64 100644 --- a/test/fixedbugs/bug111.go +++ b/test/fixedbugs/bug111.go @@ -6,7 +6,7 @@ package main -var ncall int; +var ncall int type Iffy interface { Me() Iffy @@ -17,15 +17,15 @@ type Stucky struct { } func (s *Stucky) Me() Iffy { - ncall++; + ncall++ return s } func main() { - s := new(Stucky); - i := s.Me(); - j := i.Me(); - j.Me(); + s := new(Stucky) + i := s.Me() + j := i.Me() + j.Me() if ncall != 3 { panic("bug111") } diff --git a/test/fixedbugs/bug112.go b/test/fixedbugs/bug112.go index e2ed5c0d41e54..2928bc15b5cf6 100644 --- a/test/fixedbugs/bug112.go +++ b/test/fixedbugs/bug112.go @@ -6,7 +6,8 @@ package main -type T struct { s string } +type T struct{ s string } + var t = T{"hi"} func main() {} diff --git a/test/fixedbugs/bug113.go b/test/fixedbugs/bug113.go index a1e61cb36fd83..03e22c0558924 100644 --- a/test/fixedbugs/bug113.go +++ b/test/fixedbugs/bug113.go @@ -21,7 +21,7 @@ func main() { if foo2(v2) != 1 { panic(2) } - + shouldPanic(p1) } diff --git a/test/fixedbugs/bug115.go b/test/fixedbugs/bug115.go index 7cc3dc40a604b..726d33c12422f 100644 --- a/test/fixedbugs/bug115.go +++ b/test/fixedbugs/bug115.go @@ -6,9 +6,9 @@ package main -func isuint(i uint) { } +func isuint(i uint) {} func main() { - i := ^uint(0); - isuint(i); + i := ^uint(0) + isuint(i) } diff --git a/test/fixedbugs/bug118.go b/test/fixedbugs/bug118.go index 198b8ff2801d7..ca7fdbba5d814 100644 --- a/test/fixedbugs/bug118.go +++ b/test/fixedbugs/bug118.go @@ -9,7 +9,7 @@ package bug118 func Send(c chan int) int { select { default: - return 1; + return 1 } - return 2; + return 2 } diff --git a/test/fixedbugs/bug122.go b/test/fixedbugs/bug122.go index fb4eb9f3adebe..9ae597462ddb4 100644 --- a/test/fixedbugs/bug122.go +++ b/test/fixedbugs/bug122.go @@ -8,5 +8,5 @@ package main func main() { // should allow at most 2 sizes - a := make([]int, 10, 20, 30, 40); // ERROR "too many" + a := make([]int, 10, 20, 30, 40) // ERROR "too many" } diff --git a/test/fixedbugs/bug123.go b/test/fixedbugs/bug123.go index f38551a914237..8c4f323761e82 100644 --- a/test/fixedbugs/bug123.go +++ b/test/fixedbugs/bug123.go @@ -5,9 +5,13 @@ // license that can be found in the LICENSE file. package main -const ( F = 1 ) + +const ( + F = 1 +) + func fn(i int) int { - if i == F() { // ERROR "func" + if i == F() { // ERROR "func" return 0 } return 1 diff --git a/test/fixedbugs/bug126.go b/test/fixedbugs/bug126.go index f5d9763412984..8274c1e931a23 100644 --- a/test/fixedbugs/bug126.go +++ b/test/fixedbugs/bug126.go @@ -7,5 +7,5 @@ package main // same const identifier declared twice should not be accepted -const none = 0 // GCCGO_ERROR "previous" -const none = 1; // ERROR "redeclared|redef" +const none = 0 // GCCGO_ERROR "previous" +const none = 1 // ERROR "redeclared|redef" diff --git a/test/fixedbugs/bug127.go b/test/fixedbugs/bug127.go index f8ea99470c300..573c40c681444 100644 --- a/test/fixedbugs/bug127.go +++ b/test/fixedbugs/bug127.go @@ -5,8 +5,9 @@ // license that can be found in the LICENSE file. package main + func main() { - var x int64 = 0; - println(x != nil); // ERROR "illegal|incompatible|nil" - println(0 != nil); // ERROR "illegal|incompatible|nil" + var x int64 = 0 + println(x != nil) // ERROR "illegal|incompatible|nil" + println(0 != nil) // ERROR "illegal|incompatible|nil" } diff --git a/test/fixedbugs/bug128.go b/test/fixedbugs/bug128.go index e8cbea079feb9..7389426c57526 100644 --- a/test/fixedbugs/bug128.go +++ b/test/fixedbugs/bug128.go @@ -5,19 +5,20 @@ // license that can be found in the LICENSE file. package main + func main() { switch { - // empty switch is allowed according to syntax - // unclear why it shouldn't be allowed + // empty switch is allowed according to syntax + // unclear why it shouldn't be allowed } switch tag := 0; tag { - // empty switch is allowed according to syntax - // unclear why it shouldn't be allowed + // empty switch is allowed according to syntax + // unclear why it shouldn't be allowed } } /* -uetli:~/Source/go1/test/bugs gri$ 6g bug127.go +uetli:~/Source/go1/test/bugs gri$ 6g bug127.go bug127.go:5: switch statement must have case labels bug127.go:9: switch statement must have case labels */ diff --git a/test/fixedbugs/bug129.go b/test/fixedbugs/bug129.go index 157ce78ff729b..64666e9377430 100644 --- a/test/fixedbugs/bug129.go +++ b/test/fixedbugs/bug129.go @@ -5,10 +5,11 @@ // license that can be found in the LICENSE file. package foo + import "fmt" func f() { - fmt.Println(); - fmt := 1; - _ = fmt; + fmt.Println() + fmt := 1 + _ = fmt } diff --git a/test/fixedbugs/bug130.go b/test/fixedbugs/bug130.go index 16b029af34ff7..ba38bb5551e17 100644 --- a/test/fixedbugs/bug130.go +++ b/test/fixedbugs/bug130.go @@ -8,15 +8,16 @@ package main import "os" -type I interface { send(chan <- int) } +type I interface{ send(chan<- int) } -type S struct { v int } -func (p *S) send(c chan <- int) { c <- p.v } +type S struct{ v int } + +func (p *S) send(c chan<- int) { c <- p.v } func main() { - s := S{0}; - var i I = &s; - c := make(chan int); - go i.send(c); - os.Exit(<-c); + s := S{0} + var i I = &s + c := make(chan int) + go i.send(c) + os.Exit(<-c) } diff --git a/test/fixedbugs/bug131.go b/test/fixedbugs/bug131.go index 0ebbd26069e16..de606da1679d9 100644 --- a/test/fixedbugs/bug131.go +++ b/test/fixedbugs/bug131.go @@ -7,6 +7,6 @@ package main func main() { - const a uint64 = 10; - var b int64 = a; // ERROR "convert|cannot|incompatible" + const a uint64 = 10 + var b int64 = a // ERROR "convert|cannot|incompatible" } diff --git a/test/fixedbugs/bug132.go b/test/fixedbugs/bug132.go index e334566c79b9c..b9b9e6712b9b6 100644 --- a/test/fixedbugs/bug132.go +++ b/test/fixedbugs/bug132.go @@ -7,5 +7,5 @@ package main type T struct { - x, x int // ERROR "duplicate" + x, x int // ERROR "duplicate" } diff --git a/test/fixedbugs/bug133.dir/bug0.go b/test/fixedbugs/bug133.dir/bug0.go index 19a2bfbd4b545..052de3d7accf1 100644 --- a/test/fixedbugs/bug133.dir/bug0.go +++ b/test/fixedbugs/bug133.dir/bug0.go @@ -4,4 +4,4 @@ package bug0 -type T struct { i int } +type T struct{ i int } diff --git a/test/fixedbugs/bug133.dir/bug1.go b/test/fixedbugs/bug133.dir/bug1.go index dd59b2f2ec193..d47746e4b5eb1 100644 --- a/test/fixedbugs/bug133.dir/bug1.go +++ b/test/fixedbugs/bug133.dir/bug1.go @@ -6,4 +6,4 @@ package bug1 import "./bug0" -type T struct { t bug0.T } +type T struct{ t bug0.T } diff --git a/test/fixedbugs/bug133.dir/bug2.go b/test/fixedbugs/bug133.dir/bug2.go index b6184c2e75b03..4449ded991743 100644 --- a/test/fixedbugs/bug133.dir/bug2.go +++ b/test/fixedbugs/bug133.dir/bug2.go @@ -7,10 +7,10 @@ package bug2 import _ "./bug1" import "./bug0" -type T2 struct { t bug0.T } +type T2 struct{ t bug0.T } func fn(p *T2) int { // This reference should be invalid, because bug0.T.i is local // to package bug0 and should not be visible in package bug1. - return p.t.i; // ERROR "field|undef" + return p.t.i // ERROR "field|undef" } diff --git a/test/fixedbugs/bug135.go b/test/fixedbugs/bug135.go index 34d234e224795..5cca2b252de5d 100644 --- a/test/fixedbugs/bug135.go +++ b/test/fixedbugs/bug135.go @@ -6,14 +6,15 @@ package main -type Foo interface { } +type Foo interface{} + +type T struct{} -type T struct {} func (t *T) foo() {} func main() { - t := new(T); - var i interface {}; - f, ok := i.(Foo); - _, _, _ = t, f, ok; + t := new(T) + var i interface{} + f, ok := i.(Foo) + _, _, _ = t, f, ok } diff --git a/test/fixedbugs/bug136.go b/test/fixedbugs/bug136.go index bea9bac083282..2964176afd463 100644 --- a/test/fixedbugs/bug136.go +++ b/test/fixedbugs/bug136.go @@ -7,16 +7,18 @@ package main func main() { - L: ; // ';' terminates empty statement => L does not apply to for loop +L: + ; // ';' terminates empty statement => L does not apply to for loop for i := 0; i < 10; i++ { - println(i); - break L; // ERROR "L" + println(i) + break L // ERROR "L" } - L1: { // L1 labels block => L1 does not apply to for loop +L1: + { // L1 labels block => L1 does not apply to for loop for i := 0; i < 10; i++ { - println(i); - break L1; // ERROR "L1" + println(i) + break L1 // ERROR "L1" } } } diff --git a/test/fixedbugs/bug139.go b/test/fixedbugs/bug139.go index 095e5c93cc36e..610a2b87a2a85 100644 --- a/test/fixedbugs/bug139.go +++ b/test/fixedbugs/bug139.go @@ -7,9 +7,17 @@ package main func main() { - x := false; - func () { if x { println(1); } }(); // this does not compile - func () { if x == false { println(2); } }(); // this works as expected + x := false + func() { + if x { + println(1) + } + }() // this does not compile + func() { + if x == false { + println(2) + } + }() // this works as expected } /* diff --git a/test/fixedbugs/bug141.go b/test/fixedbugs/bug141.go index 81ba6f1b561e6..f905681b6a151 100644 --- a/test/fixedbugs/bug141.go +++ b/test/fixedbugs/bug141.go @@ -8,25 +8,29 @@ package main import "os" -type S struct { i int } +type S struct{ i int } + func (p *S) Get() int { return p.i } type Empty interface { } type Getter interface { - Get() int; + Get() int } func f1(p Empty) { switch x := p.(type) { - default: println("failed to match interface", x); os.Exit(1); - case Getter: break; + default: + println("failed to match interface", x) + os.Exit(1) + case Getter: + break } } func main() { - var s S; - f1(&s); + var s S + f1(&s) } diff --git a/test/fixedbugs/bug142.go b/test/fixedbugs/bug142.go index e28d889a93d13..083b6ac8ac71a 100644 --- a/test/fixedbugs/bug142.go +++ b/test/fixedbugs/bug142.go @@ -7,12 +7,12 @@ package main func panic1(s string) bool { - panic(s); + panic(s) } func main() { - x := false && panic1("first") && panic1("second"); - x = x == true && panic1("first") && panic1("second"); + x := false && panic1("first") && panic1("second") + x = x == true && panic1("first") && panic1("second") } /* @@ -27,5 +27,5 @@ mainstart+0xf /Users/rsc/goX/src/runtime/amd64/asm.s:53 mainstart() sys·Goexit /Users/rsc/goX/src/runtime/proc.c:124 sys·Goexit() -; +; */ diff --git a/test/fixedbugs/bug143.go b/test/fixedbugs/bug143.go index a43e406676aa3..c4378f27addd1 100644 --- a/test/fixedbugs/bug143.go +++ b/test/fixedbugs/bug143.go @@ -6,34 +6,34 @@ package main -type myMap map[string] int; +type myMap map[string]int func f() myMap { - m := make(map[string] int); + m := make(map[string]int) return m } func main() { - m := make(myMap); - mp := &m; + m := make(myMap) + mp := &m { - x, ok := m["key"]; - _, _ = x, ok; + x, ok := m["key"] + _, _ = x, ok } { - x, ok := (*mp)["key"]; - _, _ = x, ok; + x, ok := (*mp)["key"] + _, _ = x, ok } { - x, ok := f()["key"]; - _, _ = x, ok; + x, ok := f()["key"] + _, _ = x, ok } { - var x int; - var ok bool; - x, ok = f()["key"]; - _, _ = x, ok; + var x int + var ok bool + x, ok = f()["key"] + _, _ = x, ok } } diff --git a/test/fixedbugs/bug144.go b/test/fixedbugs/bug144.go index 9f8ec7667ccec..f42e64ee98c4d 100644 --- a/test/fixedbugs/bug144.go +++ b/test/fixedbugs/bug144.go @@ -6,11 +6,11 @@ package main -const c = 1; +const c = 1 func main() { - c := 0; - _ = c; + c := 0 + _ = c } /* diff --git a/test/fixedbugs/bug145.go b/test/fixedbugs/bug145.go index 602fe7426df2f..44bce2a6100f1 100644 --- a/test/fixedbugs/bug145.go +++ b/test/fixedbugs/bug145.go @@ -9,8 +9,8 @@ package main type t int func main() { - t := 0; - _ = t; + t := 0 + _ = t } /* diff --git a/test/fixedbugs/bug146.go b/test/fixedbugs/bug146.go index e29f910ba5005..fcdeb4ce4266b 100644 --- a/test/fixedbugs/bug146.go +++ b/test/fixedbugs/bug146.go @@ -7,9 +7,9 @@ package main func main() { - type Slice []byte; - a := [...]byte{ 0 }; - b := Slice(a[0:]); // This should be OK. - c := Slice(a); // ERROR "invalid|illegal|cannot" - _, _ = b, c; + type Slice []byte + a := [...]byte{0} + b := Slice(a[0:]) // This should be OK. + c := Slice(a) // ERROR "invalid|illegal|cannot" + _, _ = b, c } diff --git a/test/fixedbugs/bug148.go b/test/fixedbugs/bug148.go index b67870b12a61d..e7b544439e183 100644 --- a/test/fixedbugs/bug148.go +++ b/test/fixedbugs/bug148.go @@ -6,32 +6,32 @@ package main -type T struct {a, b int}; +type T struct{ a, b int } -func println(x, y int) { } +func println(x, y int) {} func f(x interface{}) interface{} { - type T struct {a, b int}; + type T struct{ a, b int } if x == nil { - return T{2, 3}; + return T{2, 3} } - t := x.(T); - println(t.a, t.b); - return x; + t := x.(T) + println(t.a, t.b) + return x } func main() { - inner_T := f(nil); - f(inner_T); + inner_T := f(nil) + f(inner_T) shouldPanic(p1) } func p1() { - outer_T := T{5, 7}; - f(outer_T); + outer_T := T{5, 7} + f(outer_T) } func shouldPanic(f func()) { diff --git a/test/fixedbugs/bug149.go b/test/fixedbugs/bug149.go index 78b687e9718cf..d18c7479ba1d0 100644 --- a/test/fixedbugs/bug149.go +++ b/test/fixedbugs/bug149.go @@ -7,16 +7,16 @@ package main func main() { - var b1 []byte; - s1 := string(b1); - println(len(s1)); // prints 0 + var b1 []byte + s1 := string(b1) + println(len(s1)) // prints 0 - b2 := ([]byte)(nil); - s2 := string(b2); - println(len(s2)); // prints 0 + b2 := ([]byte)(nil) + s2 := string(b2) + println(len(s2)) // prints 0 - s3 := string(([]byte)(nil)); // does not compile (literal substitution of b2) - println(len(s3)); + s3 := string(([]byte)(nil)) // does not compile (literal substitution of b2) + println(len(s3)) } /* diff --git a/test/fixedbugs/bug150.go b/test/fixedbugs/bug150.go index b565ef73dd8b8..b2c4f15dc48fa 100644 --- a/test/fixedbugs/bug150.go +++ b/test/fixedbugs/bug150.go @@ -7,15 +7,16 @@ package bug150 type T int + func (t T) M() -type M interface { M() } +type M interface{ M() } func g() (T, T) func f() (a, b M) { - a, b = g(); - return; + a, b = g() + return } /* diff --git a/test/fixedbugs/bug151.go b/test/fixedbugs/bug151.go index d9f5e021c974f..87a9c0201d6a0 100644 --- a/test/fixedbugs/bug151.go +++ b/test/fixedbugs/bug151.go @@ -8,10 +8,10 @@ package bug151 type S string -type Empty interface {} +type Empty interface{} func (v S) Less(e Empty) bool { - return v < e.(S); + return v < e.(S) } /* diff --git a/test/fixedbugs/bug152.go b/test/fixedbugs/bug152.go index 45b9b3d53038e..2f297656e41ff 100644 --- a/test/fixedbugs/bug152.go +++ b/test/fixedbugs/bug152.go @@ -7,11 +7,11 @@ package main func main() { - s := 0; + s := 0 for _, v := range []int{1} { - s += v; + s += v } if s != 1 { - println("BUG: s =", s); + println("BUG: s =", s) } } diff --git a/test/fixedbugs/bug154.go b/test/fixedbugs/bug154.go index a2cfd4accdbc1..3162e80a4f24b 100644 --- a/test/fixedbugs/bug154.go +++ b/test/fixedbugs/bug154.go @@ -9,25 +9,23 @@ package main import "fmt" func f0() string { - const f = 3.141592; - return fmt.Sprintf("%v", float64(f)); + const f = 3.141592 + return fmt.Sprintf("%v", float64(f)) } - func f1() string { - const f = 3.141592; - x := float64(float32(f)); // appears to change the precision of f - _ = x; - return fmt.Sprintf("%v", float64(f)); + const f = 3.141592 + x := float64(float32(f)) // appears to change the precision of f + _ = x + return fmt.Sprintf("%v", float64(f)) } - func main() { - r0 := f0(); - r1 := f1(); + r0 := f0() + r1 := f1() if r0 != r1 { - println("r0 =", r0); - println("r1 =", r1); - panic("r0 and r1 should be the same"); + println("r0 =", r0) + println("r1 =", r1) + panic("r0 and r1 should be the same") } } diff --git a/test/fixedbugs/bug155.go b/test/fixedbugs/bug155.go index 8872e978daae6..ba2f1c04cadeb 100644 --- a/test/fixedbugs/bug155.go +++ b/test/fixedbugs/bug155.go @@ -6,7 +6,7 @@ package main -const big uint64 = 1<<63 +const big uint64 = 1 << 63 func f(a uint64) uint64 { return a << big diff --git a/test/fixedbugs/bug156.go b/test/fixedbugs/bug156.go index f26658729f82e..7b6825fe83830 100644 --- a/test/fixedbugs/bug156.go +++ b/test/fixedbugs/bug156.go @@ -7,9 +7,9 @@ package main func f(a int64) int64 { - const b int64 = 0; - n := a &^ b; - return n; + const b int64 = 0 + n := a &^ b + return n } func main() { diff --git a/test/fixedbugs/bug157.go b/test/fixedbugs/bug157.go index 1072d7df49808..160762c1ccb5f 100644 --- a/test/fixedbugs/bug157.go +++ b/test/fixedbugs/bug157.go @@ -9,23 +9,26 @@ package main func f() {} func main() { - x := 0; + x := 0 // this compiles switch x { - case 0: f(); - default: f(); + case 0: + f() + default: + f() } // this doesn't but it should // (semicolons are not needed at the end of a statement list) switch x { - case 0: f() - default: f() + case 0: + f() + default: + f() } } - /* bug157.go:20: syntax error near default bug157.go:20: first switch statement must be a case diff --git a/test/fixedbugs/bug158.go b/test/fixedbugs/bug158.go index 496d7e0db00b2..3e5c0eab2993a 100644 --- a/test/fixedbugs/bug158.go +++ b/test/fixedbugs/bug158.go @@ -7,7 +7,7 @@ package main func main() { - x := 0; + x := 0 // this compiles switch x { @@ -20,7 +20,6 @@ func main() { } } - /* bug158.go:14: fatal error: dowidth: unknown type: E-33 */ diff --git a/test/fixedbugs/bug159.go b/test/fixedbugs/bug159.go index 92d5345635d7a..7dd0497135c94 100644 --- a/test/fixedbugs/bug159.go +++ b/test/fixedbugs/bug159.go @@ -9,9 +9,9 @@ package main import "os" func main() { - ok := true; - var a, b, c, x, y, z int; - f := func() int { b--; return -b }; + ok := true + var a, b, c, x, y, z int + f := func() int { b--; return -b } // this fails on 6g: apparently it rewrites // the list into @@ -19,21 +19,21 @@ func main() { // y = f(); // x = f(); // so that the values come out backward. - x, y, z = f(), f(), f(); + x, y, z = f(), f(), f() if x != 1 || y != 2 || z != 3 { - println("xyz: expected 1 2 3 got", x, y, z); - ok = false; + println("xyz: expected 1 2 3 got", x, y, z) + ok = false } // this fails on 6g too. one of the function calls // happens after assigning to b. - a, b, c = f(), f(), f(); + a, b, c = f(), f(), f() if a != 4 || b != 5 || c != 6 { - println("abc: expected 4 5 6 got", a, b, c); - ok = false; + println("abc: expected 4 5 6 got", a, b, c) + ok = false } if !ok { - os.Exit(1); + os.Exit(1) } } diff --git a/test/fixedbugs/bug160.dir/y.go b/test/fixedbugs/bug160.dir/y.go index 428808dd19879..87039c98bc24a 100644 --- a/test/fixedbugs/bug160.dir/y.go +++ b/test/fixedbugs/bug160.dir/y.go @@ -9,11 +9,11 @@ import "./x" func main() { if x.Zero != 0 { - println("x.Zero = ", x.Zero); - os.Exit(1); + println("x.Zero = ", x.Zero) + os.Exit(1) } if x.Ten != 10 { - println("x.Ten = ", x.Ten); - os.Exit(1); + println("x.Ten = ", x.Ten) + os.Exit(1) } } diff --git a/test/fixedbugs/bug161.go b/test/fixedbugs/bug161.go index aab58ee895344..bf3c91eb82512 100644 --- a/test/fixedbugs/bug161.go +++ b/test/fixedbugs/bug161.go @@ -6,10 +6,10 @@ package P -const a = 0; +const a = 0 func f(a int) { - a = 0; + a = 0 } /* diff --git a/test/fixedbugs/bug165.go b/test/fixedbugs/bug165.go index f8d50af13fdf7..487ee992b92e1 100644 --- a/test/fixedbugs/bug165.go +++ b/test/fixedbugs/bug165.go @@ -7,9 +7,9 @@ package main type I interface { - m(map[I] bool); // ok + m(map[I]bool) // ok } type S struct { - m map[S] bool; // ERROR "map key type" + m map[S]bool // ERROR "map key type" } diff --git a/test/fixedbugs/bug170.go b/test/fixedbugs/bug170.go index 11ff5ff3c7563..3255a04b854f6 100644 --- a/test/fixedbugs/bug170.go +++ b/test/fixedbugs/bug170.go @@ -5,10 +5,11 @@ // license that can be found in the LICENSE file. package main -var v1 = ([10]int)(nil); // ERROR "illegal|nil|invalid" -var v2 [10]int = nil; // ERROR "illegal|nil|incompatible" -var v3 [10]int; -var v4 = nil; // ERROR "nil" + +var v1 = ([10]int)(nil) // ERROR "illegal|nil|invalid" +var v2 [10]int = nil // ERROR "illegal|nil|incompatible" +var v3 [10]int +var v4 = nil // ERROR "nil" func main() { - v3 = nil; // ERROR "illegal|nil|incompatible" + v3 = nil // ERROR "illegal|nil|incompatible" } diff --git a/test/fixedbugs/bug171.go b/test/fixedbugs/bug171.go index 49bbb3b892d82..9284b686f4d11 100644 --- a/test/fixedbugs/bug171.go +++ b/test/fixedbugs/bug171.go @@ -6,5 +6,5 @@ package main -func f() int { } // ERROR "return|control" -func g() (foo int) { } // ERROR "return|control" +func f() int {} // ERROR "return|control" +func g() (foo int) {} // ERROR "return|control" diff --git a/test/fixedbugs/bug172.go b/test/fixedbugs/bug172.go index 4dbe7930f907f..a4ee045ba5201 100644 --- a/test/fixedbugs/bug172.go +++ b/test/fixedbugs/bug172.go @@ -7,6 +7,6 @@ package main func f() { - a := true; - a |= a; // ERROR "illegal.*OR|bool|expected" + a := true + a |= a // ERROR "illegal.*OR|bool|expected" } diff --git a/test/fixedbugs/bug173.go b/test/fixedbugs/bug173.go index 3515c649bbeb1..20813cec99d6a 100644 --- a/test/fixedbugs/bug173.go +++ b/test/fixedbugs/bug173.go @@ -11,9 +11,10 @@ package main type T string + func main() { - var t T = "hello"; - println(t[0:4], t[4]); + var t T = "hello" + println(t[0:4], t[4]) for _, _ = range t { } for _ = range t { diff --git a/test/fixedbugs/bug174.go b/test/fixedbugs/bug174.go index 448f630867cf5..c06670859d35e 100644 --- a/test/fixedbugs/bug174.go +++ b/test/fixedbugs/bug174.go @@ -7,6 +7,6 @@ package main func main() { - var x uint; - println(1<: fatal error: dowidth: unknown type: blank */ diff --git a/test/fixedbugs/bug219.go b/test/fixedbugs/bug219.go index 290c691eabe63..0d5afd70f5552 100644 --- a/test/fixedbugs/bug219.go +++ b/test/fixedbugs/bug219.go @@ -12,9 +12,10 @@ func f(func()) int { return 0 } // bug219.go:16: syntax error near if func g1() { if x := f(func() { - if true {} + if true { + } }); true { - _ = x; + _ = x } } @@ -23,16 +24,17 @@ func g2() { if x := f(func() { //if true {} }); true { - _ = x; + _ = x } } // this works func g3() { x := f(func() { - if true {} - }); + if true { + } + }) if true { - _ = x; + _ = x } } diff --git a/test/fixedbugs/bug222.dir/chanbug.go b/test/fixedbugs/bug222.dir/chanbug.go index 16920246e00d2..75332d86c4819 100644 --- a/test/fixedbugs/bug222.dir/chanbug.go +++ b/test/fixedbugs/bug222.dir/chanbug.go @@ -3,7 +3,8 @@ // license that can be found in the LICENSE file package chanbug + var C chan<- (chan int) var D chan<- func() var E func() chan int -var F func() (func()) +var F func() func() diff --git a/test/fixedbugs/bug222.dir/chanbug2.go b/test/fixedbugs/bug222.dir/chanbug2.go index 109581dc30380..f481082ede312 100644 --- a/test/fixedbugs/bug222.dir/chanbug2.go +++ b/test/fixedbugs/bug222.dir/chanbug2.go @@ -3,4 +3,5 @@ // license that can be found in the LICENSE file package Bar + import _ "chanbug" diff --git a/test/fixedbugs/bug224.go b/test/fixedbugs/bug224.go index d2fd67cf32f3f..107924a6aefb4 100644 --- a/test/fixedbugs/bug224.go +++ b/test/fixedbugs/bug224.go @@ -6,5 +6,4 @@ package main -type T T // ERROR "recursive" - +type T T // ERROR "recursive" diff --git a/test/fixedbugs/bug225.go b/test/fixedbugs/bug225.go index 1bda9ab4b6e7d..42c432c84563d 100644 --- a/test/fixedbugs/bug225.go +++ b/test/fixedbugs/bug225.go @@ -6,17 +6,17 @@ package main -func main() { - c := make(chan bool, 1); +func main() { + c := make(chan bool, 1) select { case _ = <-c: - panic("BUG: recv should not"); + panic("BUG: recv should not") default: } - c <- true; + c <- true select { case _ = <-c: default: - panic("BUG: recv should"); + panic("BUG: recv should") } } diff --git a/test/fixedbugs/bug229.go b/test/fixedbugs/bug229.go index 4baf65e48b758..2dd10c2dac63f 100644 --- a/test/fixedbugs/bug229.go +++ b/test/fixedbugs/bug229.go @@ -10,11 +10,11 @@ import "testing" func main() { var t testing.T - + // make sure error mentions that // name is unexported, not just "name not found". - t.common.name = nil // ERROR "unexported" - - println(testing.anyLowercaseName("asdf")) // ERROR "unexported" "undefined: testing.anyLowercaseName" + t.common.name = nil // ERROR "unexported" + + println(testing.anyLowercaseName("asdf")) // ERROR "unexported" "undefined: testing.anyLowercaseName" } diff --git a/test/fixedbugs/bug231.go b/test/fixedbugs/bug231.go index f64ddc3e757cd..8b054edebd700 100644 --- a/test/fixedbugs/bug231.go +++ b/test/fixedbugs/bug231.go @@ -6,17 +6,18 @@ package main -type I interface { m() } -type T struct { m func() } -type M struct {} +type I interface{ m() } +type T struct{ m func() } +type M struct{} + func (M) m() {} func main() { var t T var m M var i I - + i = m - i = t // ERROR "not a method|has no methods" "does not implement I" + i = t // ERROR "not a method|has no methods" "does not implement I" _ = i } diff --git a/test/fixedbugs/bug232.go b/test/fixedbugs/bug232.go index 10b0c521a40b0..d7a33a24e5b0d 100644 --- a/test/fixedbugs/bug232.go +++ b/test/fixedbugs/bug232.go @@ -5,4 +5,5 @@ // license that can be found in the LICENSE file. package bug232 -type I interface { X(...int) } + +type I interface{ X(...int) } diff --git a/test/fixedbugs/bug233.go b/test/fixedbugs/bug233.go index d4e1e078169ee..9f2d8d1e3db40 100644 --- a/test/fixedbugs/bug233.go +++ b/test/fixedbugs/bug233.go @@ -5,6 +5,8 @@ // license that can be found in the LICENSE file. package bug233 + import p "fmt" + var _ = p.Print var fmt = 10 diff --git a/test/fixedbugs/bug235.go b/test/fixedbugs/bug235.go index a33092bdb64aa..8dcebca66e0cf 100644 --- a/test/fixedbugs/bug235.go +++ b/test/fixedbugs/bug235.go @@ -14,4 +14,3 @@ type T struct { var p *T var v = *p - diff --git a/test/fixedbugs/bug237.go b/test/fixedbugs/bug237.go index 75d6132df96bc..f736b9a93d6fc 100644 --- a/test/fixedbugs/bug237.go +++ b/test/fixedbugs/bug237.go @@ -9,6 +9,7 @@ package main import "fmt" var indent uint = 10 + func main() { const dots = ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . " + ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . " diff --git a/test/fixedbugs/bug238.go b/test/fixedbugs/bug238.go index cc47189e1684e..3b5995dd77321 100644 --- a/test/fixedbugs/bug238.go +++ b/test/fixedbugs/bug238.go @@ -18,4 +18,3 @@ const g interface{} = 7 // ERROR "constant|wrong|invalid" const h bool = false const i int = 2 const j float64 = 5 - diff --git a/test/fixedbugs/bug240.go b/test/fixedbugs/bug240.go index 478b5b2eafe0e..ae9dc3506229c 100644 --- a/test/fixedbugs/bug240.go +++ b/test/fixedbugs/bug240.go @@ -6,7 +6,7 @@ package main -import . "unsafe" // ERROR "not used" +import . "unsafe" // ERROR "not used" func main() { var x int diff --git a/test/fixedbugs/bug241.go b/test/fixedbugs/bug241.go index 1f4440147b974..ab7d0ce643a1a 100644 --- a/test/fixedbugs/bug241.go +++ b/test/fixedbugs/bug241.go @@ -7,5 +7,5 @@ package main const c = 3 -var x = c.String() // ERROR "String" +var x = c.String() // ERROR "String" diff --git a/test/fixedbugs/bug245.go b/test/fixedbugs/bug245.go index adf62f98b5426..9763349e25129 100644 --- a/test/fixedbugs/bug245.go +++ b/test/fixedbugs/bug245.go @@ -7,6 +7,7 @@ package main type T []int + func (t T) m() func main() { diff --git a/test/fixedbugs/bug249.go b/test/fixedbugs/bug249.go index ec9699a894ef0..1de59536bdc3e 100644 --- a/test/fixedbugs/bug249.go +++ b/test/fixedbugs/bug249.go @@ -6,34 +6,34 @@ package main -var c1 chan <- chan int = (chan<- (chan int))(nil) -var c2 chan <- chan int = (chan (<-chan int))(nil) // ERROR "chan|incompatible" -var c3 <- chan chan int = (<-chan (chan int))(nil) -var c4 chan chan <- int = (chan (chan<- int))(nil) - -var c5 <- chan <- chan int = (<-chan (<-chan int))(nil) -var c6 chan <- <- chan int = (chan<- (<-chan int))(nil) -var c7 chan <- chan <- int = (chan<- (chan<- int))(nil) - -var c8 <- chan <- chan chan int = (<-chan (<-chan (chan int)))(nil) -var c9 <- chan chan <- chan int = (<-chan (chan<- (chan int)))(nil) -var c10 chan <- <- chan chan int = (chan<- (<-chan (chan int)))(nil) -var c11 chan <- chan <- chan int = (chan<- (chan<- (chan int)))(nil) -var c12 chan chan <- <- chan int = (chan (chan<- (<-chan int)))(nil) -var c13 chan chan <- chan <- int = (chan (chan<- (chan<- int)))(nil) - -var r1 chan<- (chan int) = (chan <- chan int)(nil) -var r2 chan (<-chan int) = (chan <- chan int)(nil) // ERROR "chan|incompatible" -var r3 <-chan (chan int) = (<- chan chan int)(nil) -var r4 chan (chan<- int) = (chan chan <- int)(nil) - -var r5 <-chan (<-chan int) = (<- chan <- chan int)(nil) -var r6 chan<- (<-chan int) = (chan <- <- chan int)(nil) -var r7 chan<- (chan<- int) = (chan <- chan <- int)(nil) - -var r8 <-chan (<-chan (chan int)) = (<- chan <- chan chan int)(nil) -var r9 <-chan (chan<- (chan int)) = (<- chan chan <- chan int)(nil) -var r10 chan<- (<-chan (chan int)) = (chan <- <- chan chan int)(nil) -var r11 chan<- (chan<- (chan int)) = (chan <- chan <- chan int)(nil) -var r12 chan (chan<- (<-chan int)) = (chan chan <- <- chan int)(nil) -var r13 chan (chan<- (chan<- int)) = (chan chan <- chan <- int)(nil) +var c1 chan<- chan int = (chan<- (chan int))(nil) +var c2 chan<- chan int = (chan (<-chan int))(nil) // ERROR "chan|incompatible" +var c3 <-chan chan int = (<-chan (chan int))(nil) +var c4 chan chan<- int = (chan (chan<- int))(nil) + +var c5 <-chan <-chan int = (<-chan (<-chan int))(nil) +var c6 chan<- <-chan int = (chan<- (<-chan int))(nil) +var c7 chan<- chan<- int = (chan<- (chan<- int))(nil) + +var c8 <-chan <-chan chan int = (<-chan (<-chan (chan int)))(nil) +var c9 <-chan chan<- chan int = (<-chan (chan<- (chan int)))(nil) +var c10 chan<- <-chan chan int = (chan<- (<-chan (chan int)))(nil) +var c11 chan<- chan<- chan int = (chan<- (chan<- (chan int)))(nil) +var c12 chan chan<- <-chan int = (chan (chan<- (<-chan int)))(nil) +var c13 chan chan<- chan<- int = (chan (chan<- (chan<- int)))(nil) + +var r1 chan<- (chan int) = (chan<- chan int)(nil) +var r2 chan (<-chan int) = (chan<- chan int)(nil) // ERROR "chan|incompatible" +var r3 <-chan (chan int) = (<-chan chan int)(nil) +var r4 chan (chan<- int) = (chan chan<- int)(nil) + +var r5 <-chan (<-chan int) = (<-chan <-chan int)(nil) +var r6 chan<- (<-chan int) = (chan<- <-chan int)(nil) +var r7 chan<- (chan<- int) = (chan<- chan<- int)(nil) + +var r8 <-chan (<-chan (chan int)) = (<-chan <-chan chan int)(nil) +var r9 <-chan (chan<- (chan int)) = (<-chan chan<- chan int)(nil) +var r10 chan<- (<-chan (chan int)) = (chan<- <-chan chan int)(nil) +var r11 chan<- (chan<- (chan int)) = (chan<- chan<- chan int)(nil) +var r12 chan (chan<- (<-chan int)) = (chan chan<- <-chan int)(nil) +var r13 chan (chan<- (chan<- int)) = (chan chan<- chan<- int)(nil) diff --git a/test/fixedbugs/bug251.go b/test/fixedbugs/bug251.go index 05e111a61f810..a0c04319b34de 100644 --- a/test/fixedbugs/bug251.go +++ b/test/fixedbugs/bug251.go @@ -19,7 +19,6 @@ type I2 interface { I1 // GCCGO_ERROR "loop|interface" } - var i1 I1 = i2 var i2 I2 var i2a I2 = i1 diff --git a/test/fixedbugs/bug252.go b/test/fixedbugs/bug252.go index f678925fbb61a..19b37b00d0d60 100644 --- a/test/fixedbugs/bug252.go +++ b/test/fixedbugs/bug252.go @@ -11,5 +11,5 @@ func f(args ...int) { } func g(args ...interface{}) { - f(args) // ERROR "cannot use|incompatible" + f(args) // ERROR "cannot use|incompatible" } diff --git a/test/fixedbugs/bug256.go b/test/fixedbugs/bug256.go index 705a0321b4ef2..3a6df90969b37 100644 --- a/test/fixedbugs/bug256.go +++ b/test/fixedbugs/bug256.go @@ -6,11 +6,9 @@ package main -type T U // bogus "invalid recursive type T" from 6g +type T U // bogus "invalid recursive type T" from 6g type U int const x T = 123 -type V V // ERROR "invalid recursive type" - - +type V V // ERROR "invalid recursive type" diff --git a/test/fixedbugs/bug258.go b/test/fixedbugs/bug258.go index 075da87577cb6..d4b993ab00d64 100644 --- a/test/fixedbugs/bug258.go +++ b/test/fixedbugs/bug258.go @@ -25,7 +25,7 @@ func main() { } else { println("BUG 2") } - + if math.Pow(2, 3) != 8 { println("BUG 3") } diff --git a/test/fixedbugs/bug259.go b/test/fixedbugs/bug259.go index 857b442010093..4946a3d4dc6f7 100644 --- a/test/fixedbugs/bug259.go +++ b/test/fixedbugs/bug259.go @@ -9,7 +9,7 @@ package main import "fmt" var x = uint32(0x01020304) -var y = [...]uint32{1,2,3,4,5} +var y = [...]uint32{1, 2, 3, 4, 5} func main() { fmt.Sprint(y[byte(x)]) diff --git a/test/fixedbugs/bug261.go b/test/fixedbugs/bug261.go index abe6431b51530..3645d27d053c1 100644 --- a/test/fixedbugs/bug261.go +++ b/test/fixedbugs/bug261.go @@ -14,7 +14,7 @@ func f() int { } func main() { - x := []int{0,1,2,3,4,5,6,7,8,9,10} + x := []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10} n = 5 y := x[f():f()] if len(y) != 1 || y[0] != 6 { diff --git a/test/fixedbugs/bug266.go b/test/fixedbugs/bug266.go index 5d2334c05a84f..b51c5acdada18 100644 --- a/test/fixedbugs/bug266.go +++ b/test/fixedbugs/bug266.go @@ -13,12 +13,12 @@ func f() int { panic("oops") } -func g() int { +func g() int { return 12345 } func main() { - g() // leave 12345 on stack + g() // leave 12345 on stack x := f() if x != 0 { panic(x) diff --git a/test/fixedbugs/bug269.go b/test/fixedbugs/bug269.go index ec0dbc6c34bb4..4241faf9b5eed 100644 --- a/test/fixedbugs/bug269.go +++ b/test/fixedbugs/bug269.go @@ -13,6 +13,6 @@ func f() (ok bool) { return false } func main() { var i interface{} i = f - _ = i.(func()bool) - _ = i.(func()(bool)) + _ = i.(func() bool) + _ = i.(func() bool) } diff --git a/test/fixedbugs/bug271.go b/test/fixedbugs/bug271.go index a6abbfef7e88b..d285f29be0699 100644 --- a/test/fixedbugs/bug271.go +++ b/test/fixedbugs/bug271.go @@ -14,7 +14,7 @@ func f() (int, int) { return 1, 2 } func main() { s := fmt.Sprint(f()) - if s != "1 2" { // with bug, was "{1 2}" + if s != "1 2" { // with bug, was "{1 2}" println("BUG") } } diff --git a/test/fixedbugs/bug272.go b/test/fixedbugs/bug272.go index 6b8862f697480..ca39cbb4cee83 100644 --- a/test/fixedbugs/bug272.go +++ b/test/fixedbugs/bug272.go @@ -8,15 +8,15 @@ package main -func main() { +func main() { n := int64(100) x := make([]int, n) - x[99] = 234; + x[99] = 234 z := x[n-1] if z != 234 { println("BUG") } - n |= 1<<32 + n |= 1 << 32 defer func() { recover() }() diff --git a/test/fixedbugs/bug276.go b/test/fixedbugs/bug276.go index dc2308ea6b964..a9af72cf63b14 100644 --- a/test/fixedbugs/bug276.go +++ b/test/fixedbugs/bug276.go @@ -13,10 +13,10 @@ func main() { x := 0 a := (x & 1) << uint(1-i) - - s := uint(1-i) + + s := uint(1 - i) b := (x & 1) << s - + if a != b { panic(0) } diff --git a/test/fixedbugs/bug277.go b/test/fixedbugs/bug277.go index 207556493e86d..fe87a0700645f 100644 --- a/test/fixedbugs/bug277.go +++ b/test/fixedbugs/bug277.go @@ -43,7 +43,7 @@ func main() { x int }(s) p = (*S)(p) - f = func(x int) int(f) + f = (func(x int) int)(f) i = (interface { m(x int) int })(s) // this is accepted by 6g diff --git a/test/fixedbugs/bug278.go b/test/fixedbugs/bug278.go index 4817ebfee4e1f..592aac9190fe3 100644 --- a/test/fixedbugs/bug278.go +++ b/test/fixedbugs/bug278.go @@ -15,9 +15,9 @@ func f() [10]int { var m map[int][10]int func main() { - f()[1] = 2 // ERROR "cannot|invalid" - f()[2:3][0] = 4 // ERROR "cannot|addressable" + f()[1] = 2 // ERROR "cannot|invalid" + f()[2:3][0] = 4 // ERROR "cannot|addressable" var x = "abc" - x[2] = 3 // ERROR "cannot|invalid" - m[0][5] = 6 // ERROR "cannot|invalid" + x[2] = 3 // ERROR "cannot|invalid" + m[0][5] = 6 // ERROR "cannot|invalid" } diff --git a/test/fixedbugs/bug279.go b/test/fixedbugs/bug279.go index 3b1df3b8feb93..c2a9a533d6361 100644 --- a/test/fixedbugs/bug279.go +++ b/test/fixedbugs/bug279.go @@ -21,7 +21,7 @@ func main() { println("BUG alignof 0", n) return } - + n = unsafe.Sizeof("") if n != 8 && n != 16 { println("BUG sizeof \"\"", n) @@ -33,4 +33,3 @@ func main() { return } } - diff --git a/test/fixedbugs/bug280.go b/test/fixedbugs/bug280.go index afec57f037ad6..c23642ea20c93 100644 --- a/test/fixedbugs/bug280.go +++ b/test/fixedbugs/bug280.go @@ -8,6 +8,4 @@ package main -type A [...]int // ERROR "outside of array literal" - - +type A [...]int // ERROR "outside of array literal" diff --git a/test/fixedbugs/bug281.go b/test/fixedbugs/bug281.go index c65530f7ddb12..d52d932e320b3 100644 --- a/test/fixedbugs/bug281.go +++ b/test/fixedbugs/bug281.go @@ -17,7 +17,7 @@ type Rect struct { } func (p Point) Sub(q Point) Point { - return Point{p.X-q.X, p.Y-q.Y} + return Point{p.X - q.X, p.Y - q.Y} } type Obj struct { @@ -28,7 +28,7 @@ func (o *Obj) Bbox() Rect { return o.bbox } -func (o *Obj) Points() [2]Point{ +func (o *Obj) Points() [2]Point { return [2]Point{o.bbox.Min, o.bbox.Max} } @@ -42,12 +42,12 @@ func main() { println("BUG dot: ", q.X, q.Y) return } - + q = p.Sub(o.Points()[0]) if q.X != 0 || q.Y != 300 { println("BUG index const: ", q.X, q.Y) } - + q = p.Sub(o.Points()[x]) if q.X != 0 || q.Y != 300 { println("BUG index var: ", q.X, q.Y) diff --git a/test/fixedbugs/bug282.dir/p1.go b/test/fixedbugs/bug282.dir/p1.go index 0f7422c0ba0e2..1fbfa3aa7465d 100644 --- a/test/fixedbugs/bug282.dir/p1.go +++ b/test/fixedbugs/bug282.dir/p1.go @@ -7,4 +7,3 @@ package p1 type T struct { f func() "x" } - diff --git a/test/fixedbugs/bug282.dir/p2.go b/test/fixedbugs/bug282.dir/p2.go index f614507946602..6e72020dcf198 100644 --- a/test/fixedbugs/bug282.dir/p2.go +++ b/test/fixedbugs/bug282.dir/p2.go @@ -5,4 +5,3 @@ package p2 import _ "./p1" - diff --git a/test/fixedbugs/bug284.go b/test/fixedbugs/bug284.go index 68208085fa8c8..589eec15ebdf7 100644 --- a/test/fixedbugs/bug284.go +++ b/test/fixedbugs/bug284.go @@ -108,7 +108,7 @@ func main() { var f2 F2 f0 = f0 f0 = f1 - f0 = func(x NewInt) int(f2) // ERROR "cannot|invalid" + f0 = (func(x NewInt) int)(f2) // ERROR "cannot|invalid" f1 = f0 f1 = f1 f1 = F1(f2) // ERROR "cannot|invalid" diff --git a/test/fixedbugs/bug285.go b/test/fixedbugs/bug285.go index 0632ab4ba793c..5b33ab7d42df7 100644 --- a/test/fixedbugs/bug285.go +++ b/test/fixedbugs/bug285.go @@ -66,7 +66,7 @@ func main() { m0[z] = 42 // this should work: z is assignment-compatible with interface{} m0[new(struct { x int - })] = 42 // this should work: *struct{x int} is assignment-compatible with interface{} + })] = 42 // this should work: *struct{x int} is assignment-compatible with interface{} m0[p] = 42 // this should work: p is assignment-compatible with interface{} m0[false] = 42 // this should work: false is assignment-compatible with interface{} m0[17] = 42 // this should work: 17 is assignment-compatible with interface{} @@ -76,7 +76,7 @@ func main() { m1[i1] = 42 m1[new(struct { x int - })] = 42 // this should work: *struct{x int} is assignment-compatible with I1 + })] = 42 // this should work: *struct{x int} is assignment-compatible with I1 m1[false] = 42 // this should work: false is assignment-compatible with I1 m1[17] = 42 // this should work: 17 is assignment-compatible with I1 m1["foo"] = 42 // this should work: "foo" is assignment-compatible with I1 diff --git a/test/fixedbugs/bug287.go b/test/fixedbugs/bug287.go index 94582a86955ef..5ca280f6fa03b 100644 --- a/test/fixedbugs/bug287.go +++ b/test/fixedbugs/bug287.go @@ -8,4 +8,4 @@ package main -var mult [3][...]byte = [3][5]byte{} // ERROR "\.\.\." +var mult [3][...]byte = [3][5]byte{} // ERROR "\.\.\." diff --git a/test/fixedbugs/bug289.go b/test/fixedbugs/bug289.go index 3fc7fb2eeff7c..8334b8f5ed533 100644 --- a/test/fixedbugs/bug289.go +++ b/test/fixedbugs/bug289.go @@ -9,18 +9,18 @@ package main func f1() { - a, b := f() // ERROR "assignment mismatch|does not match" + a, b := f() // ERROR "assignment mismatch|does not match" _ = a _ = b } func f2() { var a, b int - a, b = f() // ERROR "assignment mismatch|does not match" + a, b = f() // ERROR "assignment mismatch|does not match" _ = a _ = b } func f() int { - return 1; + return 1 } diff --git a/test/fixedbugs/bug290.go b/test/fixedbugs/bug290.go index 4eee285a355f2..ae648d25316e9 100644 --- a/test/fixedbugs/bug290.go +++ b/test/fixedbugs/bug290.go @@ -8,8 +8,8 @@ package main -type X struct { x []X } +type X struct{ x []X } func main() { - type Y struct { x []Y } // used to get invalid recursive type + type Y struct{ x []Y } // used to get invalid recursive type } diff --git a/test/fixedbugs/bug293.go b/test/fixedbugs/bug293.go index ae7cc1fd1cbbb..e834a4bc85d75 100644 --- a/test/fixedbugs/bug293.go +++ b/test/fixedbugs/bug293.go @@ -9,7 +9,7 @@ package main func x() (a int, b bool) { - defer func(){ + defer func() { a++ }() a, b = y() @@ -17,7 +17,7 @@ func x() (a int, b bool) { } func x2() (a int, b bool) { - defer func(){ + defer func() { a++ }() return y() diff --git a/test/fixedbugs/bug294.go b/test/fixedbugs/bug294.go index b35b7719162c5..26e922df6bfa1 100644 --- a/test/fixedbugs/bug294.go +++ b/test/fixedbugs/bug294.go @@ -76,4 +76,3 @@ func main() { bad() } } - diff --git a/test/fixedbugs/bug295.go b/test/fixedbugs/bug295.go index d1c961ce1d8b8..691aa92c7f6d8 100644 --- a/test/fixedbugs/bug295.go +++ b/test/fixedbugs/bug295.go @@ -6,7 +6,7 @@ package main -import . "testing" // defines file-level T +import . "testing" // defines file-level T type _ B // make use of package "testing" (but don't refer to T) @@ -15,5 +15,5 @@ type S struct { } func main() { - _ = &S{T: 1} // should work + _ = &S{T: 1} // should work } diff --git a/test/fixedbugs/bug297.go b/test/fixedbugs/bug297.go index 852d208251677..6e788515c5ca9 100644 --- a/test/fixedbugs/bug297.go +++ b/test/fixedbugs/bug297.go @@ -9,7 +9,8 @@ package main type ByteSize float64 + const ( - _ = iota; // ignore first value by assigning to blank identifier - KB ByteSize = 1<<(10*X) // ERROR "undefined" "is not a constant|as type ByteSize" + _ = iota // ignore first value by assigning to blank identifier + KB ByteSize = 1 << (10 * X) // ERROR "undefined" "is not a constant|as type ByteSize" ) diff --git a/test/fixedbugs/bug302.dir/main.go b/test/fixedbugs/bug302.dir/main.go index 52c054fb4c663..9d3356f3879f2 100644 --- a/test/fixedbugs/bug302.dir/main.go +++ b/test/fixedbugs/bug302.dir/main.go @@ -9,4 +9,3 @@ import _ "p" // Check that it's still correct in pp.a (which contains p.6). import _ "pp" - diff --git a/test/fixedbugs/bug302.dir/p.go b/test/fixedbugs/bug302.dir/p.go index 0be521b4f88d5..1f3cfcbb3c773 100644 --- a/test/fixedbugs/bug302.dir/p.go +++ b/test/fixedbugs/bug302.dir/p.go @@ -5,1005 +5,1005 @@ package p type T struct { - x1 int - x2 int - x3 int - x4 int - x5 int - x6 int - x7 int - x8 int - x9 int - x10 int - x11 int - x12 int - x13 int - x14 int - x15 int - x16 int - x17 int - x18 int - x19 int - x20 int - x21 int - x22 int - x23 int - x24 int - x25 int - x26 int - x27 int - x28 int - x29 int - x30 int - x31 int - x32 int - x33 int - x34 int - x35 int - x36 int - x37 int - x38 int - x39 int - x40 int - x41 int - x42 int - x43 int - x44 int - x45 int - x46 int - x47 int - x48 int - x49 int - x50 int - x51 int - x52 int - x53 int - x54 int - x55 int - x56 int - x57 int - x58 int - x59 int - x60 int - x61 int - x62 int - x63 int - x64 int - x65 int - x66 int - x67 int - x68 int - x69 int - x70 int - x71 int - x72 int - x73 int - x74 int - x75 int - x76 int - x77 int - x78 int - x79 int - x80 int - x81 int - x82 int - x83 int - x84 int - x85 int - x86 int - x87 int - x88 int - x89 int - x90 int - x91 int - x92 int - x93 int - x94 int - x95 int - x96 int - x97 int - x98 int - x99 int - x100 int - x101 int - x102 int - x103 int - x104 int - x105 int - x106 int - x107 int - x108 int - x109 int - x110 int - x111 int - x112 int - x113 int - x114 int - x115 int - x116 int - x117 int - x118 int - x119 int - x120 int - x121 int - x122 int - x123 int - x124 int - x125 int - x126 int - x127 int - x128 int - x129 int - x130 int - x131 int - x132 int - x133 int - x134 int - x135 int - x136 int - x137 int - x138 int - x139 int - x140 int - x141 int - x142 int - x143 int - x144 int - x145 int - x146 int - x147 int - x148 int - x149 int - x150 int - x151 int - x152 int - x153 int - x154 int - x155 int - x156 int - x157 int - x158 int - x159 int - x160 int - x161 int - x162 int - x163 int - x164 int - x165 int - x166 int - x167 int - x168 int - x169 int - x170 int - x171 int - x172 int - x173 int - x174 int - x175 int - x176 int - x177 int - x178 int - x179 int - x180 int - x181 int - x182 int - x183 int - x184 int - x185 int - x186 int - x187 int - x188 int - x189 int - x190 int - x191 int - x192 int - x193 int - x194 int - x195 int - x196 int - x197 int - x198 int - x199 int - x200 int - x201 int - x202 int - x203 int - x204 int - x205 int - x206 int - x207 int - x208 int - x209 int - x210 int - x211 int - x212 int - x213 int - x214 int - x215 int - x216 int - x217 int - x218 int - x219 int - x220 int - x221 int - x222 int - x223 int - x224 int - x225 int - x226 int - x227 int - x228 int - x229 int - x230 int - x231 int - x232 int - x233 int - x234 int - x235 int - x236 int - x237 int - x238 int - x239 int - x240 int - x241 int - x242 int - x243 int - x244 int - x245 int - x246 int - x247 int - x248 int - x249 int - x250 int - x251 int - x252 int - x253 int - x254 int - x255 int - x256 int - x257 int - x258 int - x259 int - x260 int - x261 int - x262 int - x263 int - x264 int - x265 int - x266 int - x267 int - x268 int - x269 int - x270 int - x271 int - x272 int - x273 int - x274 int - x275 int - x276 int - x277 int - x278 int - x279 int - x280 int - x281 int - x282 int - x283 int - x284 int - x285 int - x286 int - x287 int - x288 int - x289 int - x290 int - x291 int - x292 int - x293 int - x294 int - x295 int - x296 int - x297 int - x298 int - x299 int - x300 int - x301 int - x302 int - x303 int - x304 int - x305 int - x306 int - x307 int - x308 int - x309 int - x310 int - x311 int - x312 int - x313 int - x314 int - x315 int - x316 int - x317 int - x318 int - x319 int - x320 int - x321 int - x322 int - x323 int - x324 int - x325 int - x326 int - x327 int - x328 int - x329 int - x330 int - x331 int - x332 int - x333 int - x334 int - x335 int - x336 int - x337 int - x338 int - x339 int - x340 int - x341 int - x342 int - x343 int - x344 int - x345 int - x346 int - x347 int - x348 int - x349 int - x350 int - x351 int - x352 int - x353 int - x354 int - x355 int - x356 int - x357 int - x358 int - x359 int - x360 int - x361 int - x362 int - x363 int - x364 int - x365 int - x366 int - x367 int - x368 int - x369 int - x370 int - x371 int - x372 int - x373 int - x374 int - x375 int - x376 int - x377 int - x378 int - x379 int - x380 int - x381 int - x382 int - x383 int - x384 int - x385 int - x386 int - x387 int - x388 int - x389 int - x390 int - x391 int - x392 int - x393 int - x394 int - x395 int - x396 int - x397 int - x398 int - x399 int - x400 int - x401 int - x402 int - x403 int - x404 int - x405 int - x406 int - x407 int - x408 int - x409 int - x410 int - x411 int - x412 int - x413 int - x414 int - x415 int - x416 int - x417 int - x418 int - x419 int - x420 int - x421 int - x422 int - x423 int - x424 int - x425 int - x426 int - x427 int - x428 int - x429 int - x430 int - x431 int - x432 int - x433 int - x434 int - x435 int - x436 int - x437 int - x438 int - x439 int - x440 int - x441 int - x442 int - x443 int - x444 int - x445 int - x446 int - x447 int - x448 int - x449 int - x450 int - x451 int - x452 int - x453 int - x454 int - x455 int - x456 int - x457 int - x458 int - x459 int - x460 int - x461 int - x462 int - x463 int - x464 int - x465 int - x466 int - x467 int - x468 int - x469 int - x470 int - x471 int - x472 int - x473 int - x474 int - x475 int - x476 int - x477 int - x478 int - x479 int - x480 int - x481 int - x482 int - x483 int - x484 int - x485 int - x486 int - x487 int - x488 int - x489 int - x490 int - x491 int - x492 int - x493 int - x494 int - x495 int - x496 int - x497 int - x498 int - x499 int - x500 int - x501 int - x502 int - x503 int - x504 int - x505 int - x506 int - x507 int - x508 int - x509 int - x510 int - x511 int - x512 int - x513 int - x514 int - x515 int - x516 int - x517 int - x518 int - x519 int - x520 int - x521 int - x522 int - x523 int - x524 int - x525 int - x526 int - x527 int - x528 int - x529 int - x530 int - x531 int - x532 int - x533 int - x534 int - x535 int - x536 int - x537 int - x538 int - x539 int - x540 int - x541 int - x542 int - x543 int - x544 int - x545 int - x546 int - x547 int - x548 int - x549 int - x550 int - x551 int - x552 int - x553 int - x554 int - x555 int - x556 int - x557 int - x558 int - x559 int - x560 int - x561 int - x562 int - x563 int - x564 int - x565 int - x566 int - x567 int - x568 int - x569 int - x570 int - x571 int - x572 int - x573 int - x574 int - x575 int - x576 int - x577 int - x578 int - x579 int - x580 int - x581 int - x582 int - x583 int - x584 int - x585 int - x586 int - x587 int - x588 int - x589 int - x590 int - x591 int - x592 int - x593 int - x594 int - x595 int - x596 int - x597 int - x598 int - x599 int - x600 int - x601 int - x602 int - x603 int - x604 int - x605 int - x606 int - x607 int - x608 int - x609 int - x610 int - x611 int - x612 int - x613 int - x614 int - x615 int - x616 int - x617 int - x618 int - x619 int - x620 int - x621 int - x622 int - x623 int - x624 int - x625 int - x626 int - x627 int - x628 int - x629 int - x630 int - x631 int - x632 int - x633 int - x634 int - x635 int - x636 int - x637 int - x638 int - x639 int - x640 int - x641 int - x642 int - x643 int - x644 int - x645 int - x646 int - x647 int - x648 int - x649 int - x650 int - x651 int - x652 int - x653 int - x654 int - x655 int - x656 int - x657 int - x658 int - x659 int - x660 int - x661 int - x662 int - x663 int - x664 int - x665 int - x666 int - x667 int - x668 int - x669 int - x670 int - x671 int - x672 int - x673 int - x674 int - x675 int - x676 int - x677 int - x678 int - x679 int - x680 int - x681 int - x682 int - x683 int - x684 int - x685 int - x686 int - x687 int - x688 int - x689 int - x690 int - x691 int - x692 int - x693 int - x694 int - x695 int - x696 int - x697 int - x698 int - x699 int - x700 int - x701 int - x702 int - x703 int - x704 int - x705 int - x706 int - x707 int - x708 int - x709 int - x710 int - x711 int - x712 int - x713 int - x714 int - x715 int - x716 int - x717 int - x718 int - x719 int - x720 int - x721 int - x722 int - x723 int - x724 int - x725 int - x726 int - x727 int - x728 int - x729 int - x730 int - x731 int - x732 int - x733 int - x734 int - x735 int - x736 int - x737 int - x738 int - x739 int - x740 int - x741 int - x742 int - x743 int - x744 int - x745 int - x746 int - x747 int - x748 int - x749 int - x750 int - x751 int - x752 int - x753 int - x754 int - x755 int - x756 int - x757 int - x758 int - x759 int - x760 int - x761 int - x762 int - x763 int - x764 int - x765 int - x766 int - x767 int - x768 int - x769 int - x770 int - x771 int - x772 int - x773 int - x774 int - x775 int - x776 int - x777 int - x778 int - x779 int - x780 int - x781 int - x782 int - x783 int - x784 int - x785 int - x786 int - x787 int - x788 int - x789 int - x790 int - x791 int - x792 int - x793 int - x794 int - x795 int - x796 int - x797 int - x798 int - x799 int - x800 int - x801 int - x802 int - x803 int - x804 int - x805 int - x806 int - x807 int - x808 int - x809 int - x810 int - x811 int - x812 int - x813 int - x814 int - x815 int - x816 int - x817 int - x818 int - x819 int - x820 int - x821 int - x822 int - x823 int - x824 int - x825 int - x826 int - x827 int - x828 int - x829 int - x830 int - x831 int - x832 int - x833 int - x834 int - x835 int - x836 int - x837 int - x838 int - x839 int - x840 int - x841 int - x842 int - x843 int - x844 int - x845 int - x846 int - x847 int - x848 int - x849 int - x850 int - x851 int - x852 int - x853 int - x854 int - x855 int - x856 int - x857 int - x858 int - x859 int - x860 int - x861 int - x862 int - x863 int - x864 int - x865 int - x866 int - x867 int - x868 int - x869 int - x870 int - x871 int - x872 int - x873 int - x874 int - x875 int - x876 int - x877 int - x878 int - x879 int - x880 int - x881 int - x882 int - x883 int - x884 int - x885 int - x886 int - x887 int - x888 int - x889 int - x890 int - x891 int - x892 int - x893 int - x894 int - x895 int - x896 int - x897 int - x898 int - x899 int - x900 int - x901 int - x902 int - x903 int - x904 int - x905 int - x906 int - x907 int - x908 int - x909 int - x910 int - x911 int - x912 int - x913 int - x914 int - x915 int - x916 int - x917 int - x918 int - x919 int - x920 int - x921 int - x922 int - x923 int - x924 int - x925 int - x926 int - x927 int - x928 int - x929 int - x930 int - x931 int - x932 int - x933 int - x934 int - x935 int - x936 int - x937 int - x938 int - x939 int - x940 int - x941 int - x942 int - x943 int - x944 int - x945 int - x946 int - x947 int - x948 int - x949 int - x950 int - x951 int - x952 int - x953 int - x954 int - x955 int - x956 int - x957 int - x958 int - x959 int - x960 int - x961 int - x962 int - x963 int - x964 int - x965 int - x966 int - x967 int - x968 int - x969 int - x970 int - x971 int - x972 int - x973 int - x974 int - x975 int - x976 int - x977 int - x978 int - x979 int - x980 int - x981 int - x982 int - x983 int - x984 int - x985 int - x986 int - x987 int - x988 int - x989 int - x990 int - x991 int - x992 int - x993 int - x994 int - x995 int - x996 int - x997 int - x998 int - x999 int + x1 int + x2 int + x3 int + x4 int + x5 int + x6 int + x7 int + x8 int + x9 int + x10 int + x11 int + x12 int + x13 int + x14 int + x15 int + x16 int + x17 int + x18 int + x19 int + x20 int + x21 int + x22 int + x23 int + x24 int + x25 int + x26 int + x27 int + x28 int + x29 int + x30 int + x31 int + x32 int + x33 int + x34 int + x35 int + x36 int + x37 int + x38 int + x39 int + x40 int + x41 int + x42 int + x43 int + x44 int + x45 int + x46 int + x47 int + x48 int + x49 int + x50 int + x51 int + x52 int + x53 int + x54 int + x55 int + x56 int + x57 int + x58 int + x59 int + x60 int + x61 int + x62 int + x63 int + x64 int + x65 int + x66 int + x67 int + x68 int + x69 int + x70 int + x71 int + x72 int + x73 int + x74 int + x75 int + x76 int + x77 int + x78 int + x79 int + x80 int + x81 int + x82 int + x83 int + x84 int + x85 int + x86 int + x87 int + x88 int + x89 int + x90 int + x91 int + x92 int + x93 int + x94 int + x95 int + x96 int + x97 int + x98 int + x99 int + x100 int + x101 int + x102 int + x103 int + x104 int + x105 int + x106 int + x107 int + x108 int + x109 int + x110 int + x111 int + x112 int + x113 int + x114 int + x115 int + x116 int + x117 int + x118 int + x119 int + x120 int + x121 int + x122 int + x123 int + x124 int + x125 int + x126 int + x127 int + x128 int + x129 int + x130 int + x131 int + x132 int + x133 int + x134 int + x135 int + x136 int + x137 int + x138 int + x139 int + x140 int + x141 int + x142 int + x143 int + x144 int + x145 int + x146 int + x147 int + x148 int + x149 int + x150 int + x151 int + x152 int + x153 int + x154 int + x155 int + x156 int + x157 int + x158 int + x159 int + x160 int + x161 int + x162 int + x163 int + x164 int + x165 int + x166 int + x167 int + x168 int + x169 int + x170 int + x171 int + x172 int + x173 int + x174 int + x175 int + x176 int + x177 int + x178 int + x179 int + x180 int + x181 int + x182 int + x183 int + x184 int + x185 int + x186 int + x187 int + x188 int + x189 int + x190 int + x191 int + x192 int + x193 int + x194 int + x195 int + x196 int + x197 int + x198 int + x199 int + x200 int + x201 int + x202 int + x203 int + x204 int + x205 int + x206 int + x207 int + x208 int + x209 int + x210 int + x211 int + x212 int + x213 int + x214 int + x215 int + x216 int + x217 int + x218 int + x219 int + x220 int + x221 int + x222 int + x223 int + x224 int + x225 int + x226 int + x227 int + x228 int + x229 int + x230 int + x231 int + x232 int + x233 int + x234 int + x235 int + x236 int + x237 int + x238 int + x239 int + x240 int + x241 int + x242 int + x243 int + x244 int + x245 int + x246 int + x247 int + x248 int + x249 int + x250 int + x251 int + x252 int + x253 int + x254 int + x255 int + x256 int + x257 int + x258 int + x259 int + x260 int + x261 int + x262 int + x263 int + x264 int + x265 int + x266 int + x267 int + x268 int + x269 int + x270 int + x271 int + x272 int + x273 int + x274 int + x275 int + x276 int + x277 int + x278 int + x279 int + x280 int + x281 int + x282 int + x283 int + x284 int + x285 int + x286 int + x287 int + x288 int + x289 int + x290 int + x291 int + x292 int + x293 int + x294 int + x295 int + x296 int + x297 int + x298 int + x299 int + x300 int + x301 int + x302 int + x303 int + x304 int + x305 int + x306 int + x307 int + x308 int + x309 int + x310 int + x311 int + x312 int + x313 int + x314 int + x315 int + x316 int + x317 int + x318 int + x319 int + x320 int + x321 int + x322 int + x323 int + x324 int + x325 int + x326 int + x327 int + x328 int + x329 int + x330 int + x331 int + x332 int + x333 int + x334 int + x335 int + x336 int + x337 int + x338 int + x339 int + x340 int + x341 int + x342 int + x343 int + x344 int + x345 int + x346 int + x347 int + x348 int + x349 int + x350 int + x351 int + x352 int + x353 int + x354 int + x355 int + x356 int + x357 int + x358 int + x359 int + x360 int + x361 int + x362 int + x363 int + x364 int + x365 int + x366 int + x367 int + x368 int + x369 int + x370 int + x371 int + x372 int + x373 int + x374 int + x375 int + x376 int + x377 int + x378 int + x379 int + x380 int + x381 int + x382 int + x383 int + x384 int + x385 int + x386 int + x387 int + x388 int + x389 int + x390 int + x391 int + x392 int + x393 int + x394 int + x395 int + x396 int + x397 int + x398 int + x399 int + x400 int + x401 int + x402 int + x403 int + x404 int + x405 int + x406 int + x407 int + x408 int + x409 int + x410 int + x411 int + x412 int + x413 int + x414 int + x415 int + x416 int + x417 int + x418 int + x419 int + x420 int + x421 int + x422 int + x423 int + x424 int + x425 int + x426 int + x427 int + x428 int + x429 int + x430 int + x431 int + x432 int + x433 int + x434 int + x435 int + x436 int + x437 int + x438 int + x439 int + x440 int + x441 int + x442 int + x443 int + x444 int + x445 int + x446 int + x447 int + x448 int + x449 int + x450 int + x451 int + x452 int + x453 int + x454 int + x455 int + x456 int + x457 int + x458 int + x459 int + x460 int + x461 int + x462 int + x463 int + x464 int + x465 int + x466 int + x467 int + x468 int + x469 int + x470 int + x471 int + x472 int + x473 int + x474 int + x475 int + x476 int + x477 int + x478 int + x479 int + x480 int + x481 int + x482 int + x483 int + x484 int + x485 int + x486 int + x487 int + x488 int + x489 int + x490 int + x491 int + x492 int + x493 int + x494 int + x495 int + x496 int + x497 int + x498 int + x499 int + x500 int + x501 int + x502 int + x503 int + x504 int + x505 int + x506 int + x507 int + x508 int + x509 int + x510 int + x511 int + x512 int + x513 int + x514 int + x515 int + x516 int + x517 int + x518 int + x519 int + x520 int + x521 int + x522 int + x523 int + x524 int + x525 int + x526 int + x527 int + x528 int + x529 int + x530 int + x531 int + x532 int + x533 int + x534 int + x535 int + x536 int + x537 int + x538 int + x539 int + x540 int + x541 int + x542 int + x543 int + x544 int + x545 int + x546 int + x547 int + x548 int + x549 int + x550 int + x551 int + x552 int + x553 int + x554 int + x555 int + x556 int + x557 int + x558 int + x559 int + x560 int + x561 int + x562 int + x563 int + x564 int + x565 int + x566 int + x567 int + x568 int + x569 int + x570 int + x571 int + x572 int + x573 int + x574 int + x575 int + x576 int + x577 int + x578 int + x579 int + x580 int + x581 int + x582 int + x583 int + x584 int + x585 int + x586 int + x587 int + x588 int + x589 int + x590 int + x591 int + x592 int + x593 int + x594 int + x595 int + x596 int + x597 int + x598 int + x599 int + x600 int + x601 int + x602 int + x603 int + x604 int + x605 int + x606 int + x607 int + x608 int + x609 int + x610 int + x611 int + x612 int + x613 int + x614 int + x615 int + x616 int + x617 int + x618 int + x619 int + x620 int + x621 int + x622 int + x623 int + x624 int + x625 int + x626 int + x627 int + x628 int + x629 int + x630 int + x631 int + x632 int + x633 int + x634 int + x635 int + x636 int + x637 int + x638 int + x639 int + x640 int + x641 int + x642 int + x643 int + x644 int + x645 int + x646 int + x647 int + x648 int + x649 int + x650 int + x651 int + x652 int + x653 int + x654 int + x655 int + x656 int + x657 int + x658 int + x659 int + x660 int + x661 int + x662 int + x663 int + x664 int + x665 int + x666 int + x667 int + x668 int + x669 int + x670 int + x671 int + x672 int + x673 int + x674 int + x675 int + x676 int + x677 int + x678 int + x679 int + x680 int + x681 int + x682 int + x683 int + x684 int + x685 int + x686 int + x687 int + x688 int + x689 int + x690 int + x691 int + x692 int + x693 int + x694 int + x695 int + x696 int + x697 int + x698 int + x699 int + x700 int + x701 int + x702 int + x703 int + x704 int + x705 int + x706 int + x707 int + x708 int + x709 int + x710 int + x711 int + x712 int + x713 int + x714 int + x715 int + x716 int + x717 int + x718 int + x719 int + x720 int + x721 int + x722 int + x723 int + x724 int + x725 int + x726 int + x727 int + x728 int + x729 int + x730 int + x731 int + x732 int + x733 int + x734 int + x735 int + x736 int + x737 int + x738 int + x739 int + x740 int + x741 int + x742 int + x743 int + x744 int + x745 int + x746 int + x747 int + x748 int + x749 int + x750 int + x751 int + x752 int + x753 int + x754 int + x755 int + x756 int + x757 int + x758 int + x759 int + x760 int + x761 int + x762 int + x763 int + x764 int + x765 int + x766 int + x767 int + x768 int + x769 int + x770 int + x771 int + x772 int + x773 int + x774 int + x775 int + x776 int + x777 int + x778 int + x779 int + x780 int + x781 int + x782 int + x783 int + x784 int + x785 int + x786 int + x787 int + x788 int + x789 int + x790 int + x791 int + x792 int + x793 int + x794 int + x795 int + x796 int + x797 int + x798 int + x799 int + x800 int + x801 int + x802 int + x803 int + x804 int + x805 int + x806 int + x807 int + x808 int + x809 int + x810 int + x811 int + x812 int + x813 int + x814 int + x815 int + x816 int + x817 int + x818 int + x819 int + x820 int + x821 int + x822 int + x823 int + x824 int + x825 int + x826 int + x827 int + x828 int + x829 int + x830 int + x831 int + x832 int + x833 int + x834 int + x835 int + x836 int + x837 int + x838 int + x839 int + x840 int + x841 int + x842 int + x843 int + x844 int + x845 int + x846 int + x847 int + x848 int + x849 int + x850 int + x851 int + x852 int + x853 int + x854 int + x855 int + x856 int + x857 int + x858 int + x859 int + x860 int + x861 int + x862 int + x863 int + x864 int + x865 int + x866 int + x867 int + x868 int + x869 int + x870 int + x871 int + x872 int + x873 int + x874 int + x875 int + x876 int + x877 int + x878 int + x879 int + x880 int + x881 int + x882 int + x883 int + x884 int + x885 int + x886 int + x887 int + x888 int + x889 int + x890 int + x891 int + x892 int + x893 int + x894 int + x895 int + x896 int + x897 int + x898 int + x899 int + x900 int + x901 int + x902 int + x903 int + x904 int + x905 int + x906 int + x907 int + x908 int + x909 int + x910 int + x911 int + x912 int + x913 int + x914 int + x915 int + x916 int + x917 int + x918 int + x919 int + x920 int + x921 int + x922 int + x923 int + x924 int + x925 int + x926 int + x927 int + x928 int + x929 int + x930 int + x931 int + x932 int + x933 int + x934 int + x935 int + x936 int + x937 int + x938 int + x939 int + x940 int + x941 int + x942 int + x943 int + x944 int + x945 int + x946 int + x947 int + x948 int + x949 int + x950 int + x951 int + x952 int + x953 int + x954 int + x955 int + x956 int + x957 int + x958 int + x959 int + x960 int + x961 int + x962 int + x963 int + x964 int + x965 int + x966 int + x967 int + x968 int + x969 int + x970 int + x971 int + x972 int + x973 int + x974 int + x975 int + x976 int + x977 int + x978 int + x979 int + x980 int + x981 int + x982 int + x983 int + x984 int + x985 int + x986 int + x987 int + x988 int + x989 int + x990 int + x991 int + x992 int + x993 int + x994 int + x995 int + x996 int + x997 int + x998 int + x999 int x1000 int } diff --git a/test/fixedbugs/bug304.go b/test/fixedbugs/bug304.go index 4073073eec646..69cb9e4d387e4 100644 --- a/test/fixedbugs/bug304.go +++ b/test/fixedbugs/bug304.go @@ -9,10 +9,12 @@ // bug304.go:15:2: internal compiler error: in copy_tree_r, at tree-inline.c:4114 package p + type S struct { v interface{} } -func g(e interface{}) { } + +func g(e interface{}) {} func f(s S) { g(s.v.(*int)) } diff --git a/test/fixedbugs/bug305.go b/test/fixedbugs/bug305.go index 0c34b1a9e71aa..f6e64cacb3db0 100644 --- a/test/fixedbugs/bug305.go +++ b/test/fixedbugs/bug305.go @@ -6,7 +6,6 @@ // Use //line to set the line number of the next line to 20. //line fixedbugs/bug305.go:20 - package p // Introduce an error which should be reported on line 24. diff --git a/test/fixedbugs/bug306.dir/p1.go b/test/fixedbugs/bug306.dir/p1.go index b28551807d663..b7a3579d04c78 100644 --- a/test/fixedbugs/bug306.dir/p1.go +++ b/test/fixedbugs/bug306.dir/p1.go @@ -5,5 +5,5 @@ package p1 type T <-chan int -var x = make(chan T) +var x = make(chan T) diff --git a/test/fixedbugs/bug306.dir/p2.go b/test/fixedbugs/bug306.dir/p2.go index f614507946602..6e72020dcf198 100644 --- a/test/fixedbugs/bug306.dir/p2.go +++ b/test/fixedbugs/bug306.dir/p2.go @@ -5,4 +5,3 @@ package p2 import _ "./p1" - diff --git a/test/fixedbugs/bug311.go b/test/fixedbugs/bug311.go index f5cab44c7e2c9..3bf8426af0f7e 100644 --- a/test/fixedbugs/bug311.go +++ b/test/fixedbugs/bug311.go @@ -9,9 +9,9 @@ package main func main() { m := make(map[string][1000]byte) m["hi"] = [1000]byte{1} - + v := m["hi"] - + for k, vv := range m { if k != "hi" || string(v[:]) != string(vv[:]) { panic("bad iter") diff --git a/test/fixedbugs/bug314.go b/test/fixedbugs/bug314.go index 6e26d14e1f544..ad8b3647652b1 100644 --- a/test/fixedbugs/bug314.go +++ b/test/fixedbugs/bug314.go @@ -10,10 +10,11 @@ package main type S struct { } -func (S) a() int{ + +func (S) a() int { return 0 } -func (S) b() int{ +func (S) b() int { return 1 } diff --git a/test/fixedbugs/bug317.go b/test/fixedbugs/bug317.go index 4cd9ec28130a3..226b7fe9ad324 100644 --- a/test/fixedbugs/bug317.go +++ b/test/fixedbugs/bug317.go @@ -12,5 +12,5 @@ func main() { } func f() uint { - return 1<<31 // doesn't panic with 1<<31 - 1 + return 1 << 31 // doesn't panic with 1<<31 - 1 } diff --git a/test/fixedbugs/bug319.go b/test/fixedbugs/bug319.go index b93106d4bdb0a..d837af9a0651e 100644 --- a/test/fixedbugs/bug319.go +++ b/test/fixedbugs/bug319.go @@ -10,7 +10,7 @@ import "unsafe" func main() { var x int - + a := uint64(uintptr(unsafe.Pointer(&x))) b := uint32(uintptr(unsafe.Pointer(&x))) c := uint16(uintptr(unsafe.Pointer(&x))) diff --git a/test/fixedbugs/bug320.go b/test/fixedbugs/bug320.go index 0406b965616d2..c6bcc0f5c0373 100644 --- a/test/fixedbugs/bug320.go +++ b/test/fixedbugs/bug320.go @@ -42,4 +42,3 @@ func escape(*int) { func f(int) { } - diff --git a/test/fixedbugs/bug322.dir/lib.go b/test/fixedbugs/bug322.dir/lib.go index 0de56d3d64935..c3387819259b1 100644 --- a/test/fixedbugs/bug322.dir/lib.go +++ b/test/fixedbugs/bug322.dir/lib.go @@ -5,7 +5,7 @@ package lib type T struct { - x int // non-exported field + x int // non-exported field } func (t T) M() { diff --git a/test/fixedbugs/bug322.dir/main.go b/test/fixedbugs/bug322.dir/main.go index f403c7d32e2ac..0b6984c6d255a 100644 --- a/test/fixedbugs/bug322.dir/main.go +++ b/test/fixedbugs/bug322.dir/main.go @@ -22,7 +22,7 @@ func main() { // This is still an error. // var i1 I = t // i1.M() - + // This combination is illegal because // PM requires a pointer receiver. // var pi1 PI = t diff --git a/test/fixedbugs/bug324.dir/prog.go b/test/fixedbugs/bug324.dir/prog.go index 3ab61f3eb5e87..4e415758cb12d 100644 --- a/test/fixedbugs/bug324.dir/prog.go +++ b/test/fixedbugs/bug324.dir/prog.go @@ -16,17 +16,16 @@ type Implementation struct{} func (p *Implementation) private() {} - func main() { // nothing unusual here var x Exported x = new(Implementation) - x.private() // main.Implementation.private() + x.private() // main.Implementation.private() // same here - should be and is legal var px p.Exported px = p.X - + // this assignment is correctly illegal: // px.private undefined (cannot refer to unexported field or method private) // px.private() @@ -44,10 +43,10 @@ func main() { recover() }() x = px.(Exported) - + println("should not get this far") // this is a legitimate call, but because of the previous assignment, // it invokes the method private in p! - x.private() // p.Implementation.private() + x.private() // p.Implementation.private() } diff --git a/test/fixedbugs/bug325.go b/test/fixedbugs/bug325.go index e6528ae46a21b..50d79d521d551 100644 --- a/test/fixedbugs/bug325.go +++ b/test/fixedbugs/bug325.go @@ -10,6 +10,6 @@ import "unsafe" func main() { var x unsafe.Pointer - println(*x) // ERROR "invalid indirect.*unsafe.Pointer" - var _ = (unsafe.Pointer)(nil).foo // ERROR "foo" + println(*x) // ERROR "invalid indirect.*unsafe.Pointer" + var _ = (unsafe.Pointer)(nil).foo // ERROR "foo" } diff --git a/test/fixedbugs/bug330.go b/test/fixedbugs/bug330.go index 2f33feb4b6afb..6c1cb1394bf42 100644 --- a/test/fixedbugs/bug330.go +++ b/test/fixedbugs/bug330.go @@ -8,6 +8,6 @@ package main func main() { x := "" - x = +"hello" // ERROR "invalid operation.*string|expected numeric" - x = +x // ERROR "invalid operation.*string|expected numeric" + x = +"hello" // ERROR "invalid operation.*string|expected numeric" + x = +x // ERROR "invalid operation.*string|expected numeric" } diff --git a/test/fixedbugs/bug332.go b/test/fixedbugs/bug332.go index d43c2ddcff598..faa445fb5a7b0 100644 --- a/test/fixedbugs/bug332.go +++ b/test/fixedbugs/bug332.go @@ -14,4 +14,4 @@ func main() {} // important: no newline on end of next line. // 6g used to print instead of bug332.go:111 -func (t *T) F() {} // ERROR "undefined: T" \ No newline at end of file +func (t *T) F() {} // ERROR "undefined: T" diff --git a/test/fixedbugs/bug333.go b/test/fixedbugs/bug333.go index 149843a3b0490..86927b26eda23 100644 --- a/test/fixedbugs/bug333.go +++ b/test/fixedbugs/bug333.go @@ -9,9 +9,9 @@ package main func main() { - type Ts string - var ts Ts - _ = []byte(ts) + type Ts string + var ts Ts + _ = []byte(ts) } /* diff --git a/test/fixedbugs/bug337.go b/test/fixedbugs/bug337.go index 1a0616f70adf5..8021c8b910959 100644 --- a/test/fixedbugs/bug337.go +++ b/test/fixedbugs/bug337.go @@ -6,7 +6,7 @@ // Issue 1722. -// Check that the error messages says +// Check that the error messages says // bug337.go:16: len("foo") not used // and not // bug337.go:16: 3 not used @@ -14,6 +14,5 @@ package main func main() { - len("foo") // ERROR "len|value computed is not used" + len("foo") // ERROR "len|value computed is not used" } - diff --git a/test/fixedbugs/bug341.go b/test/fixedbugs/bug341.go index baab28216f681..7e478f37422ef 100644 --- a/test/fixedbugs/bug341.go +++ b/test/fixedbugs/bug341.go @@ -15,6 +15,7 @@ func main() { _ = uint64(x) _ = float32(0) } + /* panic: runtime error: floating point error diff --git a/test/fixedbugs/bug343.go b/test/fixedbugs/bug343.go index fd8bd76bbfce3..e63347cd447c3 100644 --- a/test/fixedbugs/bug343.go +++ b/test/fixedbugs/bug343.go @@ -9,22 +9,22 @@ package main func getArgs(data map[string]interface{}, keys ...string) map[string]string { - ret := map[string]string{} - var ok bool - for _, k := range keys { - ret[k], ok = data[k].(string) - if !ok {} - } - return ret + ret := map[string]string{} + var ok bool + for _, k := range keys { + ret[k], ok = data[k].(string) + if !ok { + } + } + return ret } func main() { - x := getArgs(map[string]interface{}{"x":"y"}, "x") + x := getArgs(map[string]interface{}{"x": "y"}, "x") if x["x"] != "y" { println("BUG bug343", x) } } - /* typecheck [1008592b0] diff --git a/test/fixedbugs/bug344.go b/test/fixedbugs/bug344.go index b53abd26e3f11..42aace6ab6f48 100644 --- a/test/fixedbugs/bug344.go +++ b/test/fixedbugs/bug344.go @@ -14,10 +14,10 @@ func main() { i := 42 a := []*int{&i, &i, &i, &i} x := a[0] - goto start // ERROR "jumps into block" + goto start // ERROR "jumps into block" z := 1 _ = z - for _, x = range a { // GCCGO_ERROR "block" + for _, x = range a { // GCCGO_ERROR "block" start: fmt.Sprint(*x) } diff --git a/test/fixedbugs/bug347.go b/test/fixedbugs/bug347.go index 92afb2e70444f..6ea0419c39f3b 100644 --- a/test/fixedbugs/bug347.go +++ b/test/fixedbugs/bug347.go @@ -19,7 +19,7 @@ var c chan int func f() { select { - case <-t.c: // THIS IS LINE 22 + case <-t.c: // THIS IS LINE 22 break case <-c: break @@ -29,7 +29,7 @@ func f() { func main() { defer func() { recover() - for i := 0;; i++ { + for i := 0; ; i++ { pc, file, line, ok := runtime.Caller(i) if !ok { print("BUG: bug347: cannot find caller\n") diff --git a/test/fixedbugs/bug348.go b/test/fixedbugs/bug348.go index c7f134615935a..8d7dc0a3bd997 100644 --- a/test/fixedbugs/bug348.go +++ b/test/fixedbugs/bug348.go @@ -13,8 +13,8 @@ import ( func f() { var x *string - - for _, i := range *x { // THIS IS LINE 17 + + for _, i := range *x { // THIS IS LINE 17 println(i) } } @@ -24,7 +24,7 @@ func g() { func main() { defer func() { - for i := 0;; i++ { + for i := 0; ; i++ { pc, file, line, ok := runtime.Caller(i) if !ok { print("BUG: bug348: cannot find caller\n") diff --git a/test/fixedbugs/bug356.go b/test/fixedbugs/bug356.go index 6d93860be95c6..2dcd8675d0cc8 100644 --- a/test/fixedbugs/bug356.go +++ b/test/fixedbugs/bug356.go @@ -12,27 +12,26 @@ func main() { var i uint64 var x int = 12345 - if y := x << (i&5); y != 12345<<0 { + if y := x << (i & 5); y != 12345<<0 { println("BUG bug344", y) return } - + i++ - if y := x << (i&5); y != 12345<<1 { + if y := x << (i & 5); y != 12345<<1 { println("BUG bug344a", y) } - + i = 70 if y := x << i; y != 0 { println("BUG bug344b", y) } - - i = 1<<32 + + i = 1 << 32 if y := x << i; y != 0 { println("BUG bug344c", y) } } - /* typecheck [1008592b0] diff --git a/test/fixedbugs/bug357.go b/test/fixedbugs/bug357.go index e9db50e88e97c..16f3abb002963 100644 --- a/test/fixedbugs/bug357.go +++ b/test/fixedbugs/bug357.go @@ -15,7 +15,7 @@ func bla1() bool { func bla5() bool { _ = 1 - false // ERROR "false evaluated but not used|value computed is not used" + false // ERROR "false evaluated but not used|value computed is not used" _ = 2 return false } diff --git a/test/fixedbugs/bug361.go b/test/fixedbugs/bug361.go index 8e282431eb394..57e933658dc23 100644 --- a/test/fixedbugs/bug361.go +++ b/test/fixedbugs/bug361.go @@ -10,6 +10,6 @@ package test func main() { - buf := [1<<30]byte{} + buf := [1 << 30]byte{} _ = buf[:] } diff --git a/test/fixedbugs/bug362.go b/test/fixedbugs/bug362.go index 771d13d4353d6..cc73c947a39d9 100644 --- a/test/fixedbugs/bug362.go +++ b/test/fixedbugs/bug362.go @@ -10,7 +10,7 @@ package main var ( - a = iota // ERROR "undefined: iota|iota is only defined in const" - b = iota // ERROR "undefined: iota|iota is only defined in const" - c = iota // ERROR "undefined: iota|iota is only defined in const" + a = iota // ERROR "undefined: iota|iota is only defined in const" + b = iota // ERROR "undefined: iota|iota is only defined in const" + c = iota // ERROR "undefined: iota|iota is only defined in const" ) diff --git a/test/fixedbugs/bug363.go b/test/fixedbugs/bug363.go index 1bd1400987d1b..4c10a3a334140 100644 --- a/test/fixedbugs/bug363.go +++ b/test/fixedbugs/bug363.go @@ -10,12 +10,12 @@ package main func main() { var i uint = 33 - var a = (1<>1 + s += i >> 1 } return s } diff --git a/test/fixedbugs/bug369.dir/pkg.go b/test/fixedbugs/bug369.dir/pkg.go index 9964347250948..c46acff79bc0d 100644 --- a/test/fixedbugs/bug369.dir/pkg.go +++ b/test/fixedbugs/bug369.dir/pkg.go @@ -12,4 +12,3 @@ func NonASCII(b []byte, i int) int { } return i } - diff --git a/test/fixedbugs/bug372.go b/test/fixedbugs/bug372.go index 5fba131d7a229..caf5b54447574 100644 --- a/test/fixedbugs/bug372.go +++ b/test/fixedbugs/bug372.go @@ -7,7 +7,8 @@ // Issue 2355 package main -type T struct {} +type T struct{} + func (T) m() string { return "T" } type TT struct { @@ -15,7 +16,6 @@ type TT struct { m func() string } - func ff() string { return "ff" } func main() { diff --git a/test/fixedbugs/bug373.go b/test/fixedbugs/bug373.go index aa0f5d1efa685..6efdfad58b4be 100644 --- a/test/fixedbugs/bug373.go +++ b/test/fixedbugs/bug373.go @@ -9,7 +9,7 @@ package foo func f(x interface{}) { - switch t := x.(type) { // ERROR "declared and not used" + switch t := x.(type) { // ERROR "declared and not used" case int: } } diff --git a/test/fixedbugs/bug374.go b/test/fixedbugs/bug374.go index 2d604cbd3c6bd..b659b46e3900b 100644 --- a/test/fixedbugs/bug374.go +++ b/test/fixedbugs/bug374.go @@ -13,8 +13,8 @@ type I interface { type T int -var _ I = T(0) // GCCGO_ERROR "incompatible" +var _ I = T(0) // GCCGO_ERROR "incompatible" -func (T) m(buf []byte) (a int, b xxxx) { // ERROR "xxxx" +func (T) m(buf []byte) (a int, b xxxx) { // ERROR "xxxx" return 0, nil } diff --git a/test/fixedbugs/bug376.go b/test/fixedbugs/bug376.go index cd700124fe59d..d4f28c33ce9ad 100644 --- a/test/fixedbugs/bug376.go +++ b/test/fixedbugs/bug376.go @@ -6,5 +6,7 @@ // issue 1951 package foo + import "unsafe" -var v = unsafe.Sizeof // ERROR "not in function call|must be called" + +var v = unsafe.Sizeof // ERROR "not in function call|must be called" diff --git a/test/fixedbugs/bug377.dir/one.go b/test/fixedbugs/bug377.dir/one.go index e29b813a481d0..d0829473d60d0 100644 --- a/test/fixedbugs/bug377.dir/one.go +++ b/test/fixedbugs/bug377.dir/one.go @@ -7,4 +7,3 @@ package one func Foo() (n int64, _ *int) { return 42, nil } - diff --git a/test/fixedbugs/bug377.dir/two.go b/test/fixedbugs/bug377.dir/two.go index 2a10812d56d0a..9e016462c28c9 100644 --- a/test/fixedbugs/bug377.dir/two.go +++ b/test/fixedbugs/bug377.dir/two.go @@ -5,4 +5,3 @@ package two import _ "./one" - diff --git a/test/fixedbugs/bug378.go b/test/fixedbugs/bug378.go index c7b0dac31324b..d382e198b0344 100644 --- a/test/fixedbugs/bug378.go +++ b/test/fixedbugs/bug378.go @@ -9,11 +9,12 @@ package main type Header struct{} + func (h Header) Method() {} var _ interface{} = Header{} func main() { - type X Header - var _ interface{} = X{} + type X Header + var _ interface{} = X{} } diff --git a/test/fixedbugs/bug379.go b/test/fixedbugs/bug379.go index 5638123d5028f..bef19ddbedc28 100644 --- a/test/fixedbugs/bug379.go +++ b/test/fixedbugs/bug379.go @@ -6,7 +6,7 @@ // Issue 2452. -// Check that the error messages says +// Check that the error messages says // bug378.go:17: 1 + 2 not used // and not // bug378.go:17: 1 not used diff --git a/test/fixedbugs/bug380.go b/test/fixedbugs/bug380.go index 0cb34873272ba..cacaec6d090ae 100644 --- a/test/fixedbugs/bug380.go +++ b/test/fixedbugs/bug380.go @@ -7,5 +7,7 @@ // Used to cause a typechecking loop error. package pkg + type T map[int]string + var q = &T{} diff --git a/test/fixedbugs/bug381.go b/test/fixedbugs/bug381.go index a0a1c8aaa44ce..b04617cd8bd41 100644 --- a/test/fixedbugs/bug381.go +++ b/test/fixedbugs/bug381.go @@ -6,7 +6,7 @@ // Issue 2276. -// Check that the error messages says +// Check that the error messages says // bug381.go:29: unsafe.Alignof(0) not used // and not // bug381.go:29: 4 not used diff --git a/test/fixedbugs/bug382.dir/pkg.go b/test/fixedbugs/bug382.dir/pkg.go index 92fe4e335a181..d66ba8a3c60d2 100644 --- a/test/fixedbugs/bug382.dir/pkg.go +++ b/test/fixedbugs/bug382.dir/pkg.go @@ -3,5 +3,7 @@ // license that can be found in the LICENSE file. package pkg -type T struct {} + +type T struct{} + var E T diff --git a/test/fixedbugs/bug383.go b/test/fixedbugs/bug383.go index dc2ecd61fbd66..2520736745194 100644 --- a/test/fixedbugs/bug383.go +++ b/test/fixedbugs/bug383.go @@ -7,7 +7,10 @@ // Issue 2520 package main + func main() { - if 2e9 { } // ERROR "2e.09|expected bool" - if 3.14+1i { } // ERROR "3.14 . 1i|expected bool" + if 2e9 { + } // ERROR "2e.09|expected bool" + if 3.14 + 1i { + } // ERROR "3.14 . 1i|expected bool" } diff --git a/test/fixedbugs/bug384.go b/test/fixedbugs/bug384.go index d02352b478452..a84dcf488a386 100644 --- a/test/fixedbugs/bug384.go +++ b/test/fixedbugs/bug384.go @@ -9,4 +9,4 @@ package foo // Check that we only get root cause message, no further complaints about r undefined -func (r *indexWriter) foo() {} // ERROR "undefined.*indexWriter" +func (r *indexWriter) foo() {} // ERROR "undefined.*indexWriter" diff --git a/test/fixedbugs/bug385_32.go b/test/fixedbugs/bug385_32.go index 73a1311f3223f..3747141de1ca0 100644 --- a/test/fixedbugs/bug385_32.go +++ b/test/fixedbugs/bug385_32.go @@ -8,8 +8,9 @@ // Issue 2444 package main + func main() { - var arr [1000200030]int // GC_ERROR "type .* too large" + var arr [1000200030]int // GC_ERROR "type .* too large" arr_bkup := arr _ = arr_bkup } diff --git a/test/fixedbugs/bug385_64.go b/test/fixedbugs/bug385_64.go index 0f941ca2f4dfa..3c3790145b29c 100644 --- a/test/fixedbugs/bug385_64.go +++ b/test/fixedbugs/bug385_64.go @@ -10,214 +10,420 @@ package main -var z [10<<20]byte +var z [10 << 20]byte func main() { // GC_ERROR "stack frame too large" // seq 1 206 | sed 's/.*/ var x& [10<<20]byte; z = x&/' - var x1 [10<<20]byte; z = x1 - var x2 [10<<20]byte; z = x2 - var x3 [10<<20]byte; z = x3 - var x4 [10<<20]byte; z = x4 - var x5 [10<<20]byte; z = x5 - var x6 [10<<20]byte; z = x6 - var x7 [10<<20]byte; z = x7 - var x8 [10<<20]byte; z = x8 - var x9 [10<<20]byte; z = x9 - var x10 [10<<20]byte; z = x10 - var x11 [10<<20]byte; z = x11 - var x12 [10<<20]byte; z = x12 - var x13 [10<<20]byte; z = x13 - var x14 [10<<20]byte; z = x14 - var x15 [10<<20]byte; z = x15 - var x16 [10<<20]byte; z = x16 - var x17 [10<<20]byte; z = x17 - var x18 [10<<20]byte; z = x18 - var x19 [10<<20]byte; z = x19 - var x20 [10<<20]byte; z = x20 - var x21 [10<<20]byte; z = x21 - var x22 [10<<20]byte; z = x22 - var x23 [10<<20]byte; z = x23 - var x24 [10<<20]byte; z = x24 - var x25 [10<<20]byte; z = x25 - var x26 [10<<20]byte; z = x26 - var x27 [10<<20]byte; z = x27 - var x28 [10<<20]byte; z = x28 - var x29 [10<<20]byte; z = x29 - var x30 [10<<20]byte; z = x30 - var x31 [10<<20]byte; z = x31 - var x32 [10<<20]byte; z = x32 - var x33 [10<<20]byte; z = x33 - var x34 [10<<20]byte; z = x34 - var x35 [10<<20]byte; z = x35 - var x36 [10<<20]byte; z = x36 - var x37 [10<<20]byte; z = x37 - var x38 [10<<20]byte; z = x38 - var x39 [10<<20]byte; z = x39 - var x40 [10<<20]byte; z = x40 - var x41 [10<<20]byte; z = x41 - var x42 [10<<20]byte; z = x42 - var x43 [10<<20]byte; z = x43 - var x44 [10<<20]byte; z = x44 - var x45 [10<<20]byte; z = x45 - var x46 [10<<20]byte; z = x46 - var x47 [10<<20]byte; z = x47 - var x48 [10<<20]byte; z = x48 - var x49 [10<<20]byte; z = x49 - var x50 [10<<20]byte; z = x50 - var x51 [10<<20]byte; z = x51 - var x52 [10<<20]byte; z = x52 - var x53 [10<<20]byte; z = x53 - var x54 [10<<20]byte; z = x54 - var x55 [10<<20]byte; z = x55 - var x56 [10<<20]byte; z = x56 - var x57 [10<<20]byte; z = x57 - var x58 [10<<20]byte; z = x58 - var x59 [10<<20]byte; z = x59 - var x60 [10<<20]byte; z = x60 - var x61 [10<<20]byte; z = x61 - var x62 [10<<20]byte; z = x62 - var x63 [10<<20]byte; z = x63 - var x64 [10<<20]byte; z = x64 - var x65 [10<<20]byte; z = x65 - var x66 [10<<20]byte; z = x66 - var x67 [10<<20]byte; z = x67 - var x68 [10<<20]byte; z = x68 - var x69 [10<<20]byte; z = x69 - var x70 [10<<20]byte; z = x70 - var x71 [10<<20]byte; z = x71 - var x72 [10<<20]byte; z = x72 - var x73 [10<<20]byte; z = x73 - var x74 [10<<20]byte; z = x74 - var x75 [10<<20]byte; z = x75 - var x76 [10<<20]byte; z = x76 - var x77 [10<<20]byte; z = x77 - var x78 [10<<20]byte; z = x78 - var x79 [10<<20]byte; z = x79 - var x80 [10<<20]byte; z = x80 - var x81 [10<<20]byte; z = x81 - var x82 [10<<20]byte; z = x82 - var x83 [10<<20]byte; z = x83 - var x84 [10<<20]byte; z = x84 - var x85 [10<<20]byte; z = x85 - var x86 [10<<20]byte; z = x86 - var x87 [10<<20]byte; z = x87 - var x88 [10<<20]byte; z = x88 - var x89 [10<<20]byte; z = x89 - var x90 [10<<20]byte; z = x90 - var x91 [10<<20]byte; z = x91 - var x92 [10<<20]byte; z = x92 - var x93 [10<<20]byte; z = x93 - var x94 [10<<20]byte; z = x94 - var x95 [10<<20]byte; z = x95 - var x96 [10<<20]byte; z = x96 - var x97 [10<<20]byte; z = x97 - var x98 [10<<20]byte; z = x98 - var x99 [10<<20]byte; z = x99 - var x100 [10<<20]byte; z = x100 - var x101 [10<<20]byte; z = x101 - var x102 [10<<20]byte; z = x102 - var x103 [10<<20]byte; z = x103 - var x104 [10<<20]byte; z = x104 - var x105 [10<<20]byte; z = x105 - var x106 [10<<20]byte; z = x106 - var x107 [10<<20]byte; z = x107 - var x108 [10<<20]byte; z = x108 - var x109 [10<<20]byte; z = x109 - var x110 [10<<20]byte; z = x110 - var x111 [10<<20]byte; z = x111 - var x112 [10<<20]byte; z = x112 - var x113 [10<<20]byte; z = x113 - var x114 [10<<20]byte; z = x114 - var x115 [10<<20]byte; z = x115 - var x116 [10<<20]byte; z = x116 - var x117 [10<<20]byte; z = x117 - var x118 [10<<20]byte; z = x118 - var x119 [10<<20]byte; z = x119 - var x120 [10<<20]byte; z = x120 - var x121 [10<<20]byte; z = x121 - var x122 [10<<20]byte; z = x122 - var x123 [10<<20]byte; z = x123 - var x124 [10<<20]byte; z = x124 - var x125 [10<<20]byte; z = x125 - var x126 [10<<20]byte; z = x126 - var x127 [10<<20]byte; z = x127 - var x128 [10<<20]byte; z = x128 - var x129 [10<<20]byte; z = x129 - var x130 [10<<20]byte; z = x130 - var x131 [10<<20]byte; z = x131 - var x132 [10<<20]byte; z = x132 - var x133 [10<<20]byte; z = x133 - var x134 [10<<20]byte; z = x134 - var x135 [10<<20]byte; z = x135 - var x136 [10<<20]byte; z = x136 - var x137 [10<<20]byte; z = x137 - var x138 [10<<20]byte; z = x138 - var x139 [10<<20]byte; z = x139 - var x140 [10<<20]byte; z = x140 - var x141 [10<<20]byte; z = x141 - var x142 [10<<20]byte; z = x142 - var x143 [10<<20]byte; z = x143 - var x144 [10<<20]byte; z = x144 - var x145 [10<<20]byte; z = x145 - var x146 [10<<20]byte; z = x146 - var x147 [10<<20]byte; z = x147 - var x148 [10<<20]byte; z = x148 - var x149 [10<<20]byte; z = x149 - var x150 [10<<20]byte; z = x150 - var x151 [10<<20]byte; z = x151 - var x152 [10<<20]byte; z = x152 - var x153 [10<<20]byte; z = x153 - var x154 [10<<20]byte; z = x154 - var x155 [10<<20]byte; z = x155 - var x156 [10<<20]byte; z = x156 - var x157 [10<<20]byte; z = x157 - var x158 [10<<20]byte; z = x158 - var x159 [10<<20]byte; z = x159 - var x160 [10<<20]byte; z = x160 - var x161 [10<<20]byte; z = x161 - var x162 [10<<20]byte; z = x162 - var x163 [10<<20]byte; z = x163 - var x164 [10<<20]byte; z = x164 - var x165 [10<<20]byte; z = x165 - var x166 [10<<20]byte; z = x166 - var x167 [10<<20]byte; z = x167 - var x168 [10<<20]byte; z = x168 - var x169 [10<<20]byte; z = x169 - var x170 [10<<20]byte; z = x170 - var x171 [10<<20]byte; z = x171 - var x172 [10<<20]byte; z = x172 - var x173 [10<<20]byte; z = x173 - var x174 [10<<20]byte; z = x174 - var x175 [10<<20]byte; z = x175 - var x176 [10<<20]byte; z = x176 - var x177 [10<<20]byte; z = x177 - var x178 [10<<20]byte; z = x178 - var x179 [10<<20]byte; z = x179 - var x180 [10<<20]byte; z = x180 - var x181 [10<<20]byte; z = x181 - var x182 [10<<20]byte; z = x182 - var x183 [10<<20]byte; z = x183 - var x184 [10<<20]byte; z = x184 - var x185 [10<<20]byte; z = x185 - var x186 [10<<20]byte; z = x186 - var x187 [10<<20]byte; z = x187 - var x188 [10<<20]byte; z = x188 - var x189 [10<<20]byte; z = x189 - var x190 [10<<20]byte; z = x190 - var x191 [10<<20]byte; z = x191 - var x192 [10<<20]byte; z = x192 - var x193 [10<<20]byte; z = x193 - var x194 [10<<20]byte; z = x194 - var x195 [10<<20]byte; z = x195 - var x196 [10<<20]byte; z = x196 - var x197 [10<<20]byte; z = x197 - var x198 [10<<20]byte; z = x198 - var x199 [10<<20]byte; z = x199 - var x200 [10<<20]byte; z = x200 - var x201 [10<<20]byte; z = x201 - var x202 [10<<20]byte; z = x202 - var x203 [10<<20]byte; z = x203 - var x204 [10<<20]byte; z = x204 - var x205 [10<<20]byte; z = x205 - var x206 [10<<20]byte; z = x206 + var x1 [10 << 20]byte + z = x1 + var x2 [10 << 20]byte + z = x2 + var x3 [10 << 20]byte + z = x3 + var x4 [10 << 20]byte + z = x4 + var x5 [10 << 20]byte + z = x5 + var x6 [10 << 20]byte + z = x6 + var x7 [10 << 20]byte + z = x7 + var x8 [10 << 20]byte + z = x8 + var x9 [10 << 20]byte + z = x9 + var x10 [10 << 20]byte + z = x10 + var x11 [10 << 20]byte + z = x11 + var x12 [10 << 20]byte + z = x12 + var x13 [10 << 20]byte + z = x13 + var x14 [10 << 20]byte + z = x14 + var x15 [10 << 20]byte + z = x15 + var x16 [10 << 20]byte + z = x16 + var x17 [10 << 20]byte + z = x17 + var x18 [10 << 20]byte + z = x18 + var x19 [10 << 20]byte + z = x19 + var x20 [10 << 20]byte + z = x20 + var x21 [10 << 20]byte + z = x21 + var x22 [10 << 20]byte + z = x22 + var x23 [10 << 20]byte + z = x23 + var x24 [10 << 20]byte + z = x24 + var x25 [10 << 20]byte + z = x25 + var x26 [10 << 20]byte + z = x26 + var x27 [10 << 20]byte + z = x27 + var x28 [10 << 20]byte + z = x28 + var x29 [10 << 20]byte + z = x29 + var x30 [10 << 20]byte + z = x30 + var x31 [10 << 20]byte + z = x31 + var x32 [10 << 20]byte + z = x32 + var x33 [10 << 20]byte + z = x33 + var x34 [10 << 20]byte + z = x34 + var x35 [10 << 20]byte + z = x35 + var x36 [10 << 20]byte + z = x36 + var x37 [10 << 20]byte + z = x37 + var x38 [10 << 20]byte + z = x38 + var x39 [10 << 20]byte + z = x39 + var x40 [10 << 20]byte + z = x40 + var x41 [10 << 20]byte + z = x41 + var x42 [10 << 20]byte + z = x42 + var x43 [10 << 20]byte + z = x43 + var x44 [10 << 20]byte + z = x44 + var x45 [10 << 20]byte + z = x45 + var x46 [10 << 20]byte + z = x46 + var x47 [10 << 20]byte + z = x47 + var x48 [10 << 20]byte + z = x48 + var x49 [10 << 20]byte + z = x49 + var x50 [10 << 20]byte + z = x50 + var x51 [10 << 20]byte + z = x51 + var x52 [10 << 20]byte + z = x52 + var x53 [10 << 20]byte + z = x53 + var x54 [10 << 20]byte + z = x54 + var x55 [10 << 20]byte + z = x55 + var x56 [10 << 20]byte + z = x56 + var x57 [10 << 20]byte + z = x57 + var x58 [10 << 20]byte + z = x58 + var x59 [10 << 20]byte + z = x59 + var x60 [10 << 20]byte + z = x60 + var x61 [10 << 20]byte + z = x61 + var x62 [10 << 20]byte + z = x62 + var x63 [10 << 20]byte + z = x63 + var x64 [10 << 20]byte + z = x64 + var x65 [10 << 20]byte + z = x65 + var x66 [10 << 20]byte + z = x66 + var x67 [10 << 20]byte + z = x67 + var x68 [10 << 20]byte + z = x68 + var x69 [10 << 20]byte + z = x69 + var x70 [10 << 20]byte + z = x70 + var x71 [10 << 20]byte + z = x71 + var x72 [10 << 20]byte + z = x72 + var x73 [10 << 20]byte + z = x73 + var x74 [10 << 20]byte + z = x74 + var x75 [10 << 20]byte + z = x75 + var x76 [10 << 20]byte + z = x76 + var x77 [10 << 20]byte + z = x77 + var x78 [10 << 20]byte + z = x78 + var x79 [10 << 20]byte + z = x79 + var x80 [10 << 20]byte + z = x80 + var x81 [10 << 20]byte + z = x81 + var x82 [10 << 20]byte + z = x82 + var x83 [10 << 20]byte + z = x83 + var x84 [10 << 20]byte + z = x84 + var x85 [10 << 20]byte + z = x85 + var x86 [10 << 20]byte + z = x86 + var x87 [10 << 20]byte + z = x87 + var x88 [10 << 20]byte + z = x88 + var x89 [10 << 20]byte + z = x89 + var x90 [10 << 20]byte + z = x90 + var x91 [10 << 20]byte + z = x91 + var x92 [10 << 20]byte + z = x92 + var x93 [10 << 20]byte + z = x93 + var x94 [10 << 20]byte + z = x94 + var x95 [10 << 20]byte + z = x95 + var x96 [10 << 20]byte + z = x96 + var x97 [10 << 20]byte + z = x97 + var x98 [10 << 20]byte + z = x98 + var x99 [10 << 20]byte + z = x99 + var x100 [10 << 20]byte + z = x100 + var x101 [10 << 20]byte + z = x101 + var x102 [10 << 20]byte + z = x102 + var x103 [10 << 20]byte + z = x103 + var x104 [10 << 20]byte + z = x104 + var x105 [10 << 20]byte + z = x105 + var x106 [10 << 20]byte + z = x106 + var x107 [10 << 20]byte + z = x107 + var x108 [10 << 20]byte + z = x108 + var x109 [10 << 20]byte + z = x109 + var x110 [10 << 20]byte + z = x110 + var x111 [10 << 20]byte + z = x111 + var x112 [10 << 20]byte + z = x112 + var x113 [10 << 20]byte + z = x113 + var x114 [10 << 20]byte + z = x114 + var x115 [10 << 20]byte + z = x115 + var x116 [10 << 20]byte + z = x116 + var x117 [10 << 20]byte + z = x117 + var x118 [10 << 20]byte + z = x118 + var x119 [10 << 20]byte + z = x119 + var x120 [10 << 20]byte + z = x120 + var x121 [10 << 20]byte + z = x121 + var x122 [10 << 20]byte + z = x122 + var x123 [10 << 20]byte + z = x123 + var x124 [10 << 20]byte + z = x124 + var x125 [10 << 20]byte + z = x125 + var x126 [10 << 20]byte + z = x126 + var x127 [10 << 20]byte + z = x127 + var x128 [10 << 20]byte + z = x128 + var x129 [10 << 20]byte + z = x129 + var x130 [10 << 20]byte + z = x130 + var x131 [10 << 20]byte + z = x131 + var x132 [10 << 20]byte + z = x132 + var x133 [10 << 20]byte + z = x133 + var x134 [10 << 20]byte + z = x134 + var x135 [10 << 20]byte + z = x135 + var x136 [10 << 20]byte + z = x136 + var x137 [10 << 20]byte + z = x137 + var x138 [10 << 20]byte + z = x138 + var x139 [10 << 20]byte + z = x139 + var x140 [10 << 20]byte + z = x140 + var x141 [10 << 20]byte + z = x141 + var x142 [10 << 20]byte + z = x142 + var x143 [10 << 20]byte + z = x143 + var x144 [10 << 20]byte + z = x144 + var x145 [10 << 20]byte + z = x145 + var x146 [10 << 20]byte + z = x146 + var x147 [10 << 20]byte + z = x147 + var x148 [10 << 20]byte + z = x148 + var x149 [10 << 20]byte + z = x149 + var x150 [10 << 20]byte + z = x150 + var x151 [10 << 20]byte + z = x151 + var x152 [10 << 20]byte + z = x152 + var x153 [10 << 20]byte + z = x153 + var x154 [10 << 20]byte + z = x154 + var x155 [10 << 20]byte + z = x155 + var x156 [10 << 20]byte + z = x156 + var x157 [10 << 20]byte + z = x157 + var x158 [10 << 20]byte + z = x158 + var x159 [10 << 20]byte + z = x159 + var x160 [10 << 20]byte + z = x160 + var x161 [10 << 20]byte + z = x161 + var x162 [10 << 20]byte + z = x162 + var x163 [10 << 20]byte + z = x163 + var x164 [10 << 20]byte + z = x164 + var x165 [10 << 20]byte + z = x165 + var x166 [10 << 20]byte + z = x166 + var x167 [10 << 20]byte + z = x167 + var x168 [10 << 20]byte + z = x168 + var x169 [10 << 20]byte + z = x169 + var x170 [10 << 20]byte + z = x170 + var x171 [10 << 20]byte + z = x171 + var x172 [10 << 20]byte + z = x172 + var x173 [10 << 20]byte + z = x173 + var x174 [10 << 20]byte + z = x174 + var x175 [10 << 20]byte + z = x175 + var x176 [10 << 20]byte + z = x176 + var x177 [10 << 20]byte + z = x177 + var x178 [10 << 20]byte + z = x178 + var x179 [10 << 20]byte + z = x179 + var x180 [10 << 20]byte + z = x180 + var x181 [10 << 20]byte + z = x181 + var x182 [10 << 20]byte + z = x182 + var x183 [10 << 20]byte + z = x183 + var x184 [10 << 20]byte + z = x184 + var x185 [10 << 20]byte + z = x185 + var x186 [10 << 20]byte + z = x186 + var x187 [10 << 20]byte + z = x187 + var x188 [10 << 20]byte + z = x188 + var x189 [10 << 20]byte + z = x189 + var x190 [10 << 20]byte + z = x190 + var x191 [10 << 20]byte + z = x191 + var x192 [10 << 20]byte + z = x192 + var x193 [10 << 20]byte + z = x193 + var x194 [10 << 20]byte + z = x194 + var x195 [10 << 20]byte + z = x195 + var x196 [10 << 20]byte + z = x196 + var x197 [10 << 20]byte + z = x197 + var x198 [10 << 20]byte + z = x198 + var x199 [10 << 20]byte + z = x199 + var x200 [10 << 20]byte + z = x200 + var x201 [10 << 20]byte + z = x201 + var x202 [10 << 20]byte + z = x202 + var x203 [10 << 20]byte + z = x203 + var x204 [10 << 20]byte + z = x204 + var x205 [10 << 20]byte + z = x205 + var x206 [10 << 20]byte + z = x206 } diff --git a/test/fixedbugs/bug386.go b/test/fixedbugs/bug386.go index 889c8b0c12598..92fc33bb36f07 100644 --- a/test/fixedbugs/bug386.go +++ b/test/fixedbugs/bug386.go @@ -4,9 +4,9 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Issue 2451, 2452 +// Issue 2451, 2452 package foo func f() error { return 0 } // ERROR "cannot use 0 .type int.|has no methods" -func g() error { return -1 } // ERROR "cannot use -1 .type int.|has no methods" +func g() error { return -1 } // ERROR "cannot use -1 .type int.|has no methods" diff --git a/test/fixedbugs/bug387.go b/test/fixedbugs/bug387.go index d8854457446fc..2e30bc42a3b49 100644 --- a/test/fixedbugs/bug387.go +++ b/test/fixedbugs/bug387.go @@ -12,19 +12,18 @@ missing typecheck: [7f5bf07b4438] . AS l(45) . . NAME-main.autotmp_0017 u(1) a(1) l(45) x(0+0) class(PAUTO) esc(N) tc(1) used(1) ARRAY-[2]string -internal compiler error: missing typecheck +internal compiler error: missing typecheck */ package main import ( - "fmt" - "path/filepath" + "fmt" + "path/filepath" ) func main() { - switch _, err := filepath.Glob(filepath.Join(".", "vnc")); { - case err != nil: - fmt.Println(err) - } + switch _, err := filepath.Glob(filepath.Join(".", "vnc")); { + case err != nil: + fmt.Println(err) + } } - diff --git a/test/fixedbugs/bug389.go b/test/fixedbugs/bug389.go index 14804c8471540..8f40c0e2155a4 100644 --- a/test/fixedbugs/bug389.go +++ b/test/fixedbugs/bug389.go @@ -9,4 +9,4 @@ package foo func fn(a float32) {} -var f func(arg int) = fn // ERROR "cannot use fn .type func.float32.. as type func.int. in assignment|different parameter types" +var f func(arg int) = fn // ERROR "cannot use fn .type func.float32.. as type func.int. in assignment|different parameter types" diff --git a/test/fixedbugs/bug391.go b/test/fixedbugs/bug391.go index 9211b1c2cf499..00b84103bc906 100644 --- a/test/fixedbugs/bug391.go +++ b/test/fixedbugs/bug391.go @@ -7,8 +7,9 @@ // Issue 2576 package bug -type T struct { a int } +type T struct{ a int } func f(t T) { - switch _, _ = t.a, t.a; {} -} \ No newline at end of file + switch _, _ = t.a, t.a; { + } +} diff --git a/test/fixedbugs/bug392.dir/one.go b/test/fixedbugs/bug392.dir/one.go index aba8649b5b1d3..081e25c532b8f 100644 --- a/test/fixedbugs/bug392.dir/one.go +++ b/test/fixedbugs/bug392.dir/one.go @@ -18,26 +18,25 @@ func F2(c chan int) bool { return c == (<-chan int)(nil) } func F3() (ret []int) { return append(ret, 1) } // Call of inlined method with blank receiver. -func (_ *T) M() int { return 1 } +func (_ *T) M() int { return 1 } func (t *T) MM() int { return t.M() } - // One more like issue 2678 -type S struct { x, y int } +type S struct{ x, y int } type U []S -func F4(S int) U { return U{{S,S}} } +func F4(S int) U { return U{{S, S}} } func F5() []*S { - return []*S{ {1,2}, { 3, 4} } + return []*S{{1, 2}, {3, 4}} } func F6(S int) *U { - return &U{{S,S}} + return &U{{S, S}} } // Bug in the fix. -type PB struct { x int } +type PB struct{ x int } func (t *PB) Reset() { *t = PB{} } diff --git a/test/fixedbugs/bug396.dir/one.go b/test/fixedbugs/bug396.dir/one.go index 66eba63f5c1df..f599959e10a7b 100644 --- a/test/fixedbugs/bug396.dir/one.go +++ b/test/fixedbugs/bug396.dir/one.go @@ -5,6 +5,6 @@ package one // Issue 2687 -type T struct { int } +type T struct{ int } func New(i int) T { return T{i} } diff --git a/test/fixedbugs/bug396.dir/two.go b/test/fixedbugs/bug396.dir/two.go index 9152bec2545b7..4e30bfab9c9fc 100644 --- a/test/fixedbugs/bug396.dir/two.go +++ b/test/fixedbugs/bug396.dir/two.go @@ -11,4 +11,4 @@ import "./one" func use() { _ = one.New(1) -} \ No newline at end of file +} diff --git a/test/fixedbugs/bug397.go b/test/fixedbugs/bug397.go index 6188e3ee0cc64..339da2eb4b9f9 100644 --- a/test/fixedbugs/bug397.go +++ b/test/fixedbugs/bug397.go @@ -7,7 +7,7 @@ package main // Issue 2623 -var m = map[string]int { - "abc":1, - 1:2, // ERROR "cannot use 1.*as type string in map key|incompatible type" +var m = map[string]int{ + "abc": 1, + 1: 2, // ERROR "cannot use 1.*as type string in map key|incompatible type" } diff --git a/test/fixedbugs/bug398.go b/test/fixedbugs/bug398.go index a1583bd7746cb..3848cd406139e 100644 --- a/test/fixedbugs/bug398.go +++ b/test/fixedbugs/bug398.go @@ -12,33 +12,33 @@ package p // exported interfaces type I1 interface { - F() interface{I1} + F() interface{ I1 } } type I2 interface { - F() interface{I2} + F() interface{ I2 } } var V1 I1 var V2 I2 func F() bool { - return V1 == V2 + return V1 == V2 } // non-exported interfaces type i1 interface { - F() interface{i1} + F() interface{ i1 } } type i2 interface { - F() interface{i2} + F() interface{ i2 } } var v1 i1 var v2 i2 func f() bool { - return v1 == v2 + return v1 == v2 } diff --git a/test/fixedbugs/bug399.go b/test/fixedbugs/bug399.go index e460d812277d1..343add59da60c 100644 --- a/test/fixedbugs/bug399.go +++ b/test/fixedbugs/bug399.go @@ -7,9 +7,9 @@ // Issue 2674 package main + const dow = "\000\003" func main() { println(int(dow[1])) } - diff --git a/test/fixedbugs/bug405.go b/test/fixedbugs/bug405.go index e8ecc4d034afa..f0c3081976c38 100644 --- a/test/fixedbugs/bug405.go +++ b/test/fixedbugs/bug405.go @@ -8,7 +8,7 @@ package main -type S struct {} +type S struct{} func (_ S) F(i int) int { return i diff --git a/test/fixedbugs/bug407.dir/one.go b/test/fixedbugs/bug407.dir/one.go index c85b077b66cde..fd900ef4adc25 100644 --- a/test/fixedbugs/bug407.dir/one.go +++ b/test/fixedbugs/bug407.dir/one.go @@ -11,10 +11,7 @@ type T struct { } func (t *T) foo(arg int) {} -func (t T) goo(arg int) {} +func (t T) goo(arg int) {} func (t *T) F() { t.f = (*T).foo } func (t *T) G() { t.g = T.goo } - - - diff --git a/test/fixedbugs/bug410.go b/test/fixedbugs/bug410.go index a4eef64d8e911..f0761febfa8bd 100644 --- a/test/fixedbugs/bug410.go +++ b/test/fixedbugs/bug410.go @@ -12,13 +12,13 @@ type y struct { num int } -func zzz () { - k := make([]byte, 10) - arr := make ([]*y, 0) - for s := range arr { - x := make([]byte, 10) - for i := 0; i < 100 ; i++ { - x[i] ^= k[i-arr[s].num%3] - } - } +func zzz() { + k := make([]byte, 10) + arr := make([]*y, 0) + for s := range arr { + x := make([]byte, 10) + for i := 0; i < 100; i++ { + x[i] ^= k[i-arr[s].num%3] + } + } } diff --git a/test/fixedbugs/bug411.go b/test/fixedbugs/bug411.go index a1c36f617c7c0..7f90ae0e93ef3 100644 --- a/test/fixedbugs/bug411.go +++ b/test/fixedbugs/bug411.go @@ -14,6 +14,5 @@ func f1(a int64) { f2(float64(a), float64(a)) } -func f2(a,b float64) { +func f2(a, b float64) { } - diff --git a/test/fixedbugs/bug412.go b/test/fixedbugs/bug412.go index 183fb7e4af026..a39abf17e1cca 100644 --- a/test/fixedbugs/bug412.go +++ b/test/fixedbugs/bug412.go @@ -7,10 +7,10 @@ package p type t struct { - x int // GCCGO_ERROR "duplicate field name .x." - x int // GC_ERROR "duplicate field x" + x int // GCCGO_ERROR "duplicate field name .x." + x int // GC_ERROR "duplicate field x" } func f(t *t) int { - return t.x // GC_ERROR "ambiguous selector t.x" + return t.x // GC_ERROR "ambiguous selector t.x" } diff --git a/test/fixedbugs/bug413.go b/test/fixedbugs/bug413.go index 819bd1a984ea4..12e1e5e58be10 100644 --- a/test/fixedbugs/bug413.go +++ b/test/fixedbugs/bug413.go @@ -8,4 +8,4 @@ package p func f(i int) int { return i } -var i = func() int {a := f(i); return a}() // ERROR "initialization loop|depends upon itself" +var i = func() int { a := f(i); return a }() // ERROR "initialization loop|depends upon itself" diff --git a/test/fixedbugs/bug415.dir/p.go b/test/fixedbugs/bug415.dir/p.go index e86a697643b3f..fca0124014945 100644 --- a/test/fixedbugs/bug415.dir/p.go +++ b/test/fixedbugs/bug415.dir/p.go @@ -5,10 +5,9 @@ package p type A struct { - s struct{int} + s struct{ int } } func (a *A) f() { - a.s = struct{int}{0} + a.s = struct{ int }{0} } - diff --git a/test/fixedbugs/bug415.dir/prog.go b/test/fixedbugs/bug415.dir/prog.go index 1ffde188b7858..f2a4e6dd0d10a 100644 --- a/test/fixedbugs/bug415.dir/prog.go +++ b/test/fixedbugs/bug415.dir/prog.go @@ -3,7 +3,9 @@ // license that can be found in the LICENSE file. package main + import "./p" + func main() {} -var _ p.A +var _ p.A diff --git a/test/fixedbugs/bug417.go b/test/fixedbugs/bug417.go index a9acb42386add..1b44aa927c250 100644 --- a/test/fixedbugs/bug417.go +++ b/test/fixedbugs/bug417.go @@ -14,17 +14,19 @@ type S1 struct { s [][1]S3 m map[int][1]S3 c chan [1]S3 - i interface { f([1]S3) [1]S3 } + i interface{ f([1]S3) [1]S3 } f func([1]S3) [1]S3 } type S2 struct { - p *struct { F S3 } - s []struct { F S3 } - m map[int]struct { F S3 } - c chan struct { F S3 } - i interface { f(struct { F S3 }) struct { F S3 } } - f func(struct { F S3 } ) struct { F S3 } + p *struct{ F S3 } + s []struct{ F S3 } + m map[int]struct{ F S3 } + c chan struct{ F S3 } + i interface { + f(struct{ F S3 }) struct{ F S3 } + } + f func(struct{ F S3 }) struct{ F S3 } } type S3 struct { diff --git a/test/fixedbugs/bug420.go b/test/fixedbugs/bug420.go index 02b4349d807ac..6601597cad16d 100644 --- a/test/fixedbugs/bug420.go +++ b/test/fixedbugs/bug420.go @@ -10,5 +10,5 @@ package main func main() { - (_) = 0 + (_) = 0 } diff --git a/test/fixedbugs/bug421.go b/test/fixedbugs/bug421.go index 1fe02375ab695..b1f1c562756d2 100644 --- a/test/fixedbugs/bug421.go +++ b/test/fixedbugs/bug421.go @@ -10,8 +10,8 @@ package main func main() { - println(int(1) == uint(1)) // ERROR "types" + println(int(1) == uint(1)) // ERROR "types" var x int = 1 var y uint = 1 - println(x == y) // ERROR "types" + println(x == y) // ERROR "types" } diff --git a/test/fixedbugs/bug424.dir/main.go b/test/fixedbugs/bug424.dir/main.go index 28b41e68a737d..adf01fc1127d4 100644 --- a/test/fixedbugs/bug424.dir/main.go +++ b/test/fixedbugs/bug424.dir/main.go @@ -59,7 +59,7 @@ func main() { if t3.m() != "main.localT.m" { println("BUG: t3:", t3.m(), "called") } - + i = new(myT3) if i.m() != "main.localT.m" { t := reflect.TypeOf(i) @@ -70,7 +70,7 @@ func main() { } println("BUG: myT3:", i.m(), "called") } - + var t4 struct { localT lib.T @@ -82,7 +82,7 @@ func main() { if i.m() != "main.localT.m" { println("BUG: myT4:", i.m(), "called") } - + var t5 struct { lib.T localT diff --git a/test/fixedbugs/bug424.go b/test/fixedbugs/bug424.go index 9c59abe8026bf..6423961fe0f42 100644 --- a/test/fixedbugs/bug424.go +++ b/test/fixedbugs/bug424.go @@ -10,4 +10,3 @@ // embedding is done. package ignored - diff --git a/test/fixedbugs/bug425.go b/test/fixedbugs/bug425.go index c3035f6a91591..a13a82c0f8239 100644 --- a/test/fixedbugs/bug425.go +++ b/test/fixedbugs/bug425.go @@ -13,5 +13,5 @@ import "fmt" func main() { s := "hello" fmt.Println(s == "") - fmt.Println(s + "world" == "world") + fmt.Println(s+"world" == "world") } diff --git a/test/fixedbugs/bug427.go b/test/fixedbugs/bug427.go index c13bb815ca402..a1b3f5b7fafa5 100644 --- a/test/fixedbugs/bug427.go +++ b/test/fixedbugs/bug427.go @@ -9,10 +9,10 @@ package main // struct with four fields of basic type -type S struct {a, b, c, d int} +type S struct{ a, b, c, d int } // struct with five fields of basic type -type T struct {a, b, c, d, e int} +type T struct{ a, b, c, d, e int } // array with four elements type A [4]int diff --git a/test/fixedbugs/bug439.go b/test/fixedbugs/bug439.go index 87d4ae0373a14..1ad7b7f443c90 100644 --- a/test/fixedbugs/bug439.go +++ b/test/fixedbugs/bug439.go @@ -14,7 +14,7 @@ func (e E) P() *E { return &e } const ( C1 E = 0 - C2 = C1 + C2 = C1 ) func F() *E { diff --git a/test/fixedbugs/bug441.go b/test/fixedbugs/bug441.go index b67125b1e88ab..a0b051e62fbe5 100644 --- a/test/fixedbugs/bug441.go +++ b/test/fixedbugs/bug441.go @@ -23,11 +23,13 @@ func main() { } } -func foo(_ int) {} +func foo(_ int) {} func foo2(_, _ int) {} func foo3(int, int) {} + type T int -func (_ T) m1() {} + +func (_ T) m1() {} func (t T) m2(_ int) {} func side() int { diff --git a/test/fixedbugs/bug442.go b/test/fixedbugs/bug442.go index 684d54ffbbd63..c3e1d5b20fd5c 100644 --- a/test/fixedbugs/bug442.go +++ b/test/fixedbugs/bug442.go @@ -20,7 +20,7 @@ func main() { m := map[T]int{} m[T{X: 1, Y: 2}] = 1 m[T{X: 2, Y: 3}] = 2 - m[T{X: 1, Y: 2}] = 3 // overwrites first entry + m[T{X: 1, Y: 2}] = 3 // overwrites first entry if len(m) != 2 { println("BUG") } diff --git a/test/fixedbugs/bug443.go b/test/fixedbugs/bug443.go index 9abd2548a589b..eaa3d5582373b 100644 --- a/test/fixedbugs/bug443.go +++ b/test/fixedbugs/bug443.go @@ -9,9 +9,9 @@ package p -type T1 struct { F *T2 } +type T1 struct{ F *T2 } type T2 T1 type T3 T2 -func (*T3) M() // was invalid receiver +func (*T3) M() // was invalid receiver diff --git a/test/fixedbugs/bug444.go b/test/fixedbugs/bug444.go index 29a60f590f06e..69c5bd8e59789 100644 --- a/test/fixedbugs/bug444.go +++ b/test/fixedbugs/bug444.go @@ -12,14 +12,14 @@ package main import "reflect" -type T interface {} +type T interface{} var x bool func main() { - reflect.TypeOf(nil) - reflect.TypeOf(T(nil)) // used to miscompile - shouldPanic() + reflect.TypeOf(nil) + reflect.TypeOf(T(nil)) // used to miscompile + shouldPanic() } func f() byte { diff --git a/test/fixedbugs/bug446.go b/test/fixedbugs/bug446.go index 1e435e1109ee2..580415c181100 100644 --- a/test/fixedbugs/bug446.go +++ b/test/fixedbugs/bug446.go @@ -33,4 +33,3 @@ func main() { panic("dummy2 != 2") } } - diff --git a/test/fixedbugs/bug447.go b/test/fixedbugs/bug447.go index 8358f0034f91e..db3b8404ecd1c 100644 --- a/test/fixedbugs/bug447.go +++ b/test/fixedbugs/bug447.go @@ -16,8 +16,8 @@ import ( ) var ( - intWidths = []int{8, 16, 32, 64} // int%d and uint%d - floatWidths = []int{32, 64} // float%d + intWidths = []int{8, 16, 32, 64} // int%d and uint%d + floatWidths = []int{32, 64} // float%d ) func main() { @@ -59,8 +59,7 @@ const testSegment = ` } }` -const testFunc = -`func test$I(f float64, i int64) { +const testFunc = `func test$I(f float64, i int64) { if i != int64($I(i))$TEST { return } @@ -68,8 +67,7 @@ $TESTSEGMENTS } ` -var program = -`package main +var program = `package main import ( "fmt" diff --git a/test/fixedbugs/bug448.dir/pkg2.go b/test/fixedbugs/bug448.dir/pkg2.go index 20d850915dde7..8eee8e88dde3b 100644 --- a/test/fixedbugs/bug448.dir/pkg2.go +++ b/test/fixedbugs/bug448.dir/pkg2.go @@ -11,4 +11,3 @@ import "./pkg1" func F() { pkg1.Do() } - diff --git a/test/fixedbugs/bug460.go b/test/fixedbugs/bug460.go index a1b6f477ffd69..130d190cb315d 100644 --- a/test/fixedbugs/bug460.go +++ b/test/fixedbugs/bug460.go @@ -7,4 +7,3 @@ // part one of issue 4124. Make sure that the compiler rejects access attempts. package ignored - diff --git a/test/fixedbugs/bug462.go b/test/fixedbugs/bug462.go index 3df63b091ddbb..4765e18afdf8f 100644 --- a/test/fixedbugs/bug462.go +++ b/test/fixedbugs/bug462.go @@ -13,7 +13,7 @@ type T struct { } func main() { - _ = T { + _ = T{ os.File: 1, // ERROR "unknown T? ?field" } } diff --git a/test/fixedbugs/bug466.dir/a.go b/test/fixedbugs/bug466.dir/a.go index e27699c2ef51f..21fe0a6062efc 100644 --- a/test/fixedbugs/bug466.dir/a.go +++ b/test/fixedbugs/bug466.dir/a.go @@ -4,7 +4,7 @@ package a -const N = 2+3i +const N = 2 + 3i func Func() []complex128 { return []complex128{1, complex(2, 3), complex(4, 5)} diff --git a/test/fixedbugs/bug466.go b/test/fixedbugs/bug466.go index dc909d483cdf4..c2a15ef7076aa 100644 --- a/test/fixedbugs/bug466.go +++ b/test/fixedbugs/bug466.go @@ -8,4 +8,3 @@ // complex literals "a+bi" to "a+b". package ignored - diff --git a/test/fixedbugs/bug468.dir/p1.go b/test/fixedbugs/bug468.dir/p1.go index cdda735e96570..b35e08acb4abc 100644 --- a/test/fixedbugs/bug468.dir/p1.go +++ b/test/fixedbugs/bug468.dir/p1.go @@ -4,4 +4,4 @@ package p1 -type S struct { X, Y int } +type S struct{ X, Y int } diff --git a/test/fixedbugs/bug468.dir/p2.go b/test/fixedbugs/bug468.dir/p2.go index dbb46931b825f..42deea8bd5138 100644 --- a/test/fixedbugs/bug468.dir/p2.go +++ b/test/fixedbugs/bug468.dir/p2.go @@ -12,7 +12,7 @@ import ( func main() { var v1 = p1.S{1, 2} - var v2 = struct { X, Y int }{1, 2} + var v2 = struct{ X, Y int }{1, 2} v1 = v2 t1 := reflect.TypeOf(v1) t2 := reflect.TypeOf(v2) diff --git a/test/fixedbugs/bug470.go b/test/fixedbugs/bug470.go index c21663f3f312c..72326b6e85065 100644 --- a/test/fixedbugs/bug470.go +++ b/test/fixedbugs/bug470.go @@ -11,8 +11,8 @@ package main import "fmt" const ( - F32 = 0.00999999977648258209228515625 - F64 = 0.01000000000000000020816681711721685132943093776702880859375 + F32 = 0.00999999977648258209228515625 + F64 = 0.01000000000000000020816681711721685132943093776702880859375 ) var F = float64(float32(0.01)) diff --git a/test/fixedbugs/bug479.dir/a.go b/test/fixedbugs/bug479.dir/a.go index eddb4cf0781a1..424fc45d30132 100644 --- a/test/fixedbugs/bug479.dir/a.go +++ b/test/fixedbugs/bug479.dir/a.go @@ -6,7 +6,7 @@ package p import "unsafe" -type S2 struct {} +type S2 struct{} const C = unsafe.Sizeof(S2{}) diff --git a/test/fixedbugs/bug480.dir/a.go b/test/fixedbugs/bug480.dir/a.go index 26a8d1166976a..cd87d87f2dae7 100644 --- a/test/fixedbugs/bug480.dir/a.go +++ b/test/fixedbugs/bug480.dir/a.go @@ -4,7 +4,7 @@ package a -type S interface{ +type S interface { F() T } diff --git a/test/fixedbugs/bug486.go b/test/fixedbugs/bug486.go index 9ad23b3cfcb7d..dce43f4b0e614 100644 --- a/test/fixedbugs/bug486.go +++ b/test/fixedbugs/bug486.go @@ -11,4 +11,4 @@ package main /*// comment -*/ + */ diff --git a/test/fixedbugs/bug487.go b/test/fixedbugs/bug487.go index ab61a19a94548..c61dcb0f31a61 100644 --- a/test/fixedbugs/bug487.go +++ b/test/fixedbugs/bug487.go @@ -14,11 +14,11 @@ func G() (int, int, int) { } func F() { - a, b := G() // ERROR "assignment mismatch" - a, b = G() // ERROR "assignment mismatch" + a, b := G() // ERROR "assignment mismatch" + a, b = G() // ERROR "assignment mismatch" _, _ = a, b } func H() (int, int) { - return G() // ERROR "too many|mismatch" + return G() // ERROR "too many|mismatch" } diff --git a/test/fixedbugs/bug488.dir/a.go b/test/fixedbugs/bug488.dir/a.go index fc494207a1739..798011414eb0c 100644 --- a/test/fixedbugs/bug488.dir/a.go +++ b/test/fixedbugs/bug488.dir/a.go @@ -4,4 +4,4 @@ package a -var p2 = Printf // ERROR "undefined" +var p2 = Printf // ERROR "undefined" diff --git a/test/fixedbugs/bug490.go b/test/fixedbugs/bug490.go index 387a680aeefdf..1d8b29d037a4a 100644 --- a/test/fixedbugs/bug490.go +++ b/test/fixedbugs/bug490.go @@ -8,7 +8,7 @@ // interface and an empty struct literal. package p - + type S struct{} func F(v interface{}) bool { diff --git a/test/fixedbugs/bug491.go b/test/fixedbugs/bug491.go index 39a3509c69e32..6bc7b470f0f9f 100644 --- a/test/fixedbugs/bug491.go +++ b/test/fixedbugs/bug491.go @@ -107,4 +107,4 @@ func bug() { println("BUG") bugged = true } -} \ No newline at end of file +} diff --git a/test/fixedbugs/bug500.go b/test/fixedbugs/bug500.go index 2dd5df13b0c5a..e57de98b60e19 100644 --- a/test/fixedbugs/bug500.go +++ b/test/fixedbugs/bug500.go @@ -35,7 +35,7 @@ func init() { func main() { runtime.GC() - if a[0].str != b + c { + if a[0].str != b+c { panic(a[0].str) } } diff --git a/test/fixedbugs/gcc61264.go b/test/fixedbugs/gcc61264.go index a4092f5bec313..569f601bc8df4 100644 --- a/test/fixedbugs/gcc61264.go +++ b/test/fixedbugs/gcc61264.go @@ -9,5 +9,5 @@ package main func main() { - map[int]int{}[0]++ + map[int]int{}[0]++ } diff --git a/test/fixedbugs/gcc67968.dir/b.go b/test/fixedbugs/gcc67968.dir/b.go index 41b62d2088070..dd9eddae317e1 100644 --- a/test/fixedbugs/gcc67968.dir/b.go +++ b/test/fixedbugs/gcc67968.dir/b.go @@ -6,7 +6,7 @@ package b import "./a" -func F() (interface{}) { - var v *a.T - return v.Foo() +func F() interface{} { + var v *a.T + return v.Foo() } diff --git a/test/fixedbugs/issue10607a.go b/test/fixedbugs/issue10607a.go index 51399e4ecfcca..92a7474fa19df 100644 --- a/test/fixedbugs/issue10607a.go +++ b/test/fixedbugs/issue10607a.go @@ -54,7 +54,7 @@ func main() { // 3 == NT_GNU_BUILD_ID if typ == 3 && namesz == 4 && bytes.Equal(d[12:16], []byte("GNU\000")) { - id := string(d[12+an:12+an+descsz]) + id := string(d[12+an : 12+an+descsz]) if id == "\x12\x34\x56\x78" { c++ } else { diff --git a/test/fixedbugs/issue11326.go b/test/fixedbugs/issue11326.go index 82754c73fba62..178f1335b60af 100644 --- a/test/fixedbugs/issue11326.go +++ b/test/fixedbugs/issue11326.go @@ -18,14 +18,14 @@ func main() { // Any implementation must be able to handle these constants at // compile time (even though they cannot be assigned to a float64). - var _ = 1e646456992 // ERROR "1e\+646456992 overflows float64" - var _ = 1e64645699 // ERROR "1e\+64645699 overflows float64" - var _ = 1e6464569 // ERROR "1e\+6464569 overflows float64" - var _ = 1e646456 // ERROR "1e\+646456 overflows float64" - var _ = 1e64645 // ERROR "1e\+64645 overflows float64" - var _ = 1e6464 // ERROR "1e\+6464 overflows float64" - var _ = 1e646 // ERROR "1e\+646 overflows float64" - var _ = 1e309 // ERROR "1e\+309 overflows float64" + var _ = 1e646456992 // ERROR "1e\+646456992 overflows float64" + var _ = 1e64645699 // ERROR "1e\+64645699 overflows float64" + var _ = 1e6464569 // ERROR "1e\+6464569 overflows float64" + var _ = 1e646456 // ERROR "1e\+646456 overflows float64" + var _ = 1e64645 // ERROR "1e\+64645 overflows float64" + var _ = 1e6464 // ERROR "1e\+6464 overflows float64" + var _ = 1e646 // ERROR "1e\+646 overflows float64" + var _ = 1e309 // ERROR "1e\+309 overflows float64" var _ = 1e308 } diff --git a/test/fixedbugs/issue11361.go b/test/fixedbugs/issue11361.go index d01776b47ca7a..7d0577595b259 100644 --- a/test/fixedbugs/issue11361.go +++ b/test/fixedbugs/issue11361.go @@ -6,6 +6,6 @@ package a -import "fmt" // ERROR "imported and not used" +import "fmt" // ERROR "imported and not used" const n = fmt // ERROR "fmt without selector" "fmt is not a constant" diff --git a/test/fixedbugs/issue11362.go b/test/fixedbugs/issue11362.go index 9e9e599595f6e..2c14e9e318aa5 100644 --- a/test/fixedbugs/issue11362.go +++ b/test/fixedbugs/issue11362.go @@ -12,4 +12,3 @@ import _ "unicode//utf8" // ERROR "non-canonical import path .unicode//utf8. \(s func main() { } - diff --git a/test/fixedbugs/issue12677.dir/p.go b/test/fixedbugs/issue12677.dir/p.go index e395071f8d545..40cd8721581a6 100644 --- a/test/fixedbugs/issue12677.dir/p.go +++ b/test/fixedbugs/issue12677.dir/p.go @@ -3,6 +3,7 @@ // license that can be found in the LICENSE file. package p + func Baz(f int) float64 { - return 1 / float64(int(1)<<(uint(f))) + return 1 / float64(int(1)<<(uint(f))) } diff --git a/test/fixedbugs/issue12677.dir/q.go b/test/fixedbugs/issue12677.dir/q.go index fd39c8a9ca6bc..ae4fb8aa84c19 100644 --- a/test/fixedbugs/issue12677.dir/q.go +++ b/test/fixedbugs/issue12677.dir/q.go @@ -3,5 +3,7 @@ // license that can be found in the LICENSE file. package q + import "./p" + func f() { println(p.Baz(2)) } diff --git a/test/fixedbugs/issue13261.go b/test/fixedbugs/issue13261.go index a944f3a9b5724..1b39f08ce82de 100644 --- a/test/fixedbugs/issue13261.go +++ b/test/fixedbugs/issue13261.go @@ -13,17 +13,23 @@ type T struct{} func main() { _ = &T{} _ = &(T{}) - _ = &((T{})) + _ = &(T{}) _ = &struct{}{} _ = &(struct{}{}) - _ = &((struct{}{})) - - switch (&T{}) {} - switch &(T{}) {} - switch &((T{})) {} + _ = &(struct{}{}) - switch &struct{}{} {} - switch &(struct{}{}) {} - switch &((struct{}{})) {} + switch (&T{}) { + } + switch &(T{}) { + } + switch &(T{}) { + } + + switch &struct{}{} { + } + switch &(struct{}{}) { + } + switch &(struct{}{}) { + } } diff --git a/test/fixedbugs/issue13265.go b/test/fixedbugs/issue13265.go index 3036ba7c24408..1668eaac327e9 100644 --- a/test/fixedbugs/issue13265.go +++ b/test/fixedbugs/issue13265.go @@ -9,7 +9,7 @@ package p func f() { - var c chan chan chan int - for ; ; <-<-<-c { - } + var c chan chan chan int + for ; ; <-<-<-c { + } } diff --git a/test/fixedbugs/issue13337.go b/test/fixedbugs/issue13337.go index 81f984b7322b1..4138eaf583009 100644 --- a/test/fixedbugs/issue13337.go +++ b/test/fixedbugs/issue13337.go @@ -10,6 +10,7 @@ package s type S0 struct{ f int } + func (S0) m() {} type S1 struct{ S0 } diff --git a/test/fixedbugs/issue13415.go b/test/fixedbugs/issue13415.go index 989a1ed50f12b..20085a3f4934b 100644 --- a/test/fixedbugs/issue13415.go +++ b/test/fixedbugs/issue13415.go @@ -10,10 +10,10 @@ package p func f() { - select { - case x, x := <-func() chan int { // ERROR "x repeated on left side of :=" - c := make(chan int) - return c - }(): - } + select { + case x, x := <-func() chan int { // ERROR "x repeated on left side of :=" + c := make(chan int) + return c + }(): + } } diff --git a/test/fixedbugs/issue13485.go b/test/fixedbugs/issue13485.go index a9beea1f7dfb9..982dba494cc2d 100644 --- a/test/fixedbugs/issue13485.go +++ b/test/fixedbugs/issue13485.go @@ -9,7 +9,7 @@ package p var ( _ [10]int _ [10.0]int - _ [float64(10)]int // ERROR "invalid array bound" + _ [float64(10)]int // ERROR "invalid array bound" _ [10 + 0i]int _ [complex(10, 0)]int _ [complex128(complex(10, 0))]int // ERROR "invalid array bound" diff --git a/test/fixedbugs/issue14136.go b/test/fixedbugs/issue14136.go index f9efd05f96c8c..12d18c37b1649 100644 --- a/test/fixedbugs/issue14136.go +++ b/test/fixedbugs/issue14136.go @@ -15,5 +15,5 @@ type T struct{} func main() { t := T{X: 1, X: 1, X: 1, X: 1, X: 1, X: 1, X: 1, X: 1, X: 1, X: 1} // ERROR "unknown field 'X' in struct literal of type T" - var s string = 1 // ERROR "cannot use 1" + var s string = 1 // ERROR "cannot use 1" } diff --git a/test/fixedbugs/issue14321.go b/test/fixedbugs/issue14321.go index 058008c386f18..dbef63179b5ff 100644 --- a/test/fixedbugs/issue14321.go +++ b/test/fixedbugs/issue14321.go @@ -8,14 +8,14 @@ package p -type A struct{ +type A struct { H int } func (A) F() {} func (A) G() {} -type B struct{ +type B struct { G int H int } diff --git a/test/fixedbugs/issue14540.go b/test/fixedbugs/issue14540.go index 62b17a04c482e..cc55c7f522442 100644 --- a/test/fixedbugs/issue14540.go +++ b/test/fixedbugs/issue14540.go @@ -10,10 +10,11 @@ func f(x int) { switch x { case 0: fallthrough - ; // ok + // ok case 1: fallthrough // ERROR "fallthrough statement out of place" - {} + { + } case 2: fallthrough // ERROR "cannot fallthrough" } diff --git a/test/fixedbugs/issue14651.go b/test/fixedbugs/issue14651.go index 4c756e502e25f..49eb816554bc8 100644 --- a/test/fixedbugs/issue14651.go +++ b/test/fixedbugs/issue14651.go @@ -18,9 +18,9 @@ import ( ) const ( - p149 = 1.0 / (1 << 149) // 1p-149 - p500 = 1.0 / (1 << 500) // 1p-500 - p1074 = p500 * p500 / (1<<74) // 1p-1074 + p149 = 1.0 / (1 << 149) // 1p-149 + p500 = 1.0 / (1 << 500) // 1p-500 + p1074 = p500 * p500 / (1 << 74) // 1p-1074 ) const ( diff --git a/test/fixedbugs/issue14729.go b/test/fixedbugs/issue14729.go index 88e01f9e16c32..50b615e2cf9b2 100644 --- a/test/fixedbugs/issue14729.go +++ b/test/fixedbugs/issue14729.go @@ -10,5 +10,5 @@ package main import "unsafe" -type s struct { unsafe.Pointer } // ERROR "embedded type cannot be a pointer" -type s1 struct { p unsafe.Pointer } +type s struct{ unsafe.Pointer } // ERROR "embedded type cannot be a pointer" +type s1 struct{ p unsafe.Pointer } diff --git a/test/fixedbugs/issue15039.go b/test/fixedbugs/issue15039.go index 85d9e8340aa13..243653e3f0d1f 100644 --- a/test/fixedbugs/issue15039.go +++ b/test/fixedbugs/issue15039.go @@ -18,7 +18,7 @@ func main() { } // cmd/compile used to require integer constants to fit into an "int". - const huge = string(1<<100) + const huge = string(1 << 100) if huge != fffd { panic("huge != bad") } diff --git a/test/fixedbugs/issue15042.go b/test/fixedbugs/issue15042.go index 85d5d6c361a06..7941bd7157363 100644 --- a/test/fixedbugs/issue15042.go +++ b/test/fixedbugs/issue15042.go @@ -22,6 +22,6 @@ func F(c bool, s1, s2 S) (int, int) { func main() { i, j := F(true, S{1}, S{20}) if i != 20 || j != 1 { - panic(i+j) + panic(i + j) } } diff --git a/test/fixedbugs/issue15311.go b/test/fixedbugs/issue15311.go index 81fa54132574c..6f4ad85feb49e 100644 --- a/test/fixedbugs/issue15311.go +++ b/test/fixedbugs/issue15311.go @@ -10,11 +10,11 @@ package p type T struct { - toInt map[string]int - toString map[int]string + toInt map[string]int + toString map[int]string } var t = T{ - foo.toInt: make(map[string]int), // ERROR "field name" - bar.toString: make(map[int]string), // ERROR "field name" + foo.toInt: make(map[string]int), // ERROR "field name" + bar.toString: make(map[int]string), // ERROR "field name" } diff --git a/test/fixedbugs/issue15439.go b/test/fixedbugs/issue15439.go index 840a3c02a8b43..d53077d11a314 100644 --- a/test/fixedbugs/issue15439.go +++ b/test/fixedbugs/issue15439.go @@ -10,7 +10,9 @@ import "reflect" func main() { a := &struct{ x int }{} - b := &struct{ x int "" }{} + b := &struct { + x int "" + }{} ta := reflect.TypeOf(a) tb := reflect.TypeOf(b) diff --git a/test/fixedbugs/issue15470.dir/a.go b/test/fixedbugs/issue15470.dir/a.go index 1fcf3ea6e010c..69b63530ba348 100644 --- a/test/fixedbugs/issue15470.dir/a.go +++ b/test/fixedbugs/issue15470.dir/a.go @@ -10,10 +10,10 @@ type T interface { type S struct{} -func (S) M0(_ int) {} -func (S) M1(x, _ int) {} +func (S) M0(_ int) {} +func (S) M1(x, _ int) {} func (S) M2() (x, _ int) { return } -func (_ S) M3() {} +func (_ S) M3() {} // Snippet from x/tools/godoc/analysis/analysis.go. // Offending code from #5470. diff --git a/test/fixedbugs/issue15548.dir/c.go b/test/fixedbugs/issue15548.dir/c.go index 6d3f3be53ec2a..ce6e3204b3ea2 100644 --- a/test/fixedbugs/issue15548.dir/c.go +++ b/test/fixedbugs/issue15548.dir/c.go @@ -5,6 +5,6 @@ package c import ( - _ "./b" _ "./a" + _ "./b" ) diff --git a/test/fixedbugs/issue15646.go b/test/fixedbugs/issue15646.go index cd4ba9d4e5203..53ccd4096e264 100644 --- a/test/fixedbugs/issue15646.go +++ b/test/fixedbugs/issue15646.go @@ -6,4 +6,4 @@ // Test that method expressions are correctly encoded // in binary export data and can be imported again. -package ignore \ No newline at end of file +package ignore diff --git a/test/fixedbugs/issue15926.go b/test/fixedbugs/issue15926.go index 76e25eb640a47..8004545e14e6f 100644 --- a/test/fixedbugs/issue15926.go +++ b/test/fixedbugs/issue15926.go @@ -16,5 +16,5 @@ func (s S) def() {} var I = S.def func main() { - I(S{}) + I(S{}) } diff --git a/test/fixedbugs/issue16515.go b/test/fixedbugs/issue16515.go index 6b67436383832..cacff54bfae78 100644 --- a/test/fixedbugs/issue16515.go +++ b/test/fixedbugs/issue16515.go @@ -34,7 +34,10 @@ func g() { } func main() { - var s struct { a T; b [8192-62]int } // allocate 64K, hopefully it's in a new span and a few bytes before it is garbage + var s struct { + a T + b [8192 - 62]int + } // allocate 64K, hopefully it's in a new span and a few bytes before it is garbage sink = &s // force heap allocation s.a[0] = 2 zero(&s.a) diff --git a/test/fixedbugs/issue16948.go b/test/fixedbugs/issue16948.go index c98602489614b..65c87c3f05efb 100644 --- a/test/fixedbugs/issue16948.go +++ b/test/fixedbugs/issue16948.go @@ -18,6 +18,7 @@ func main() { var x int32 type T [10]int + var sink *T func f() (t T) { diff --git a/test/fixedbugs/issue17449.go b/test/fixedbugs/issue17449.go index 23029178e8dcf..0d2806bd4cfdb 100644 --- a/test/fixedbugs/issue17449.go +++ b/test/fixedbugs/issue17449.go @@ -10,25 +10,25 @@ package master type PriorityList struct { - elems []interface{} + elems []interface{} } func (x *PriorityList) Len() int { return len(x.elems) } func (l *PriorityList) remove(i int) interface{} { - elem := l.elems[i] - l.elems = append(l.elems[:i], l.elems[i+1:]...) - return elem + elem := l.elems[i] + l.elems = append(l.elems[:i], l.elems[i+1:]...) + return elem } func (l *PriorityList) Next() interface{} { - return l.remove(l.Len() - 1) + return l.remove(l.Len() - 1) } var l *PriorityList func Foo() { - // It would fail here if instrumented code (including inline-label) was copied. - for elem := l.Next(); elem != nil; elem = l.Next() { - } + // It would fail here if instrumented code (including inline-label) was copied. + for elem := l.Next(); elem != nil; elem = l.Next() { + } } diff --git a/test/fixedbugs/issue17588.go b/test/fixedbugs/issue17588.go index 1be57c6292300..23af6f613b02a 100644 --- a/test/fixedbugs/issue17588.go +++ b/test/fixedbugs/issue17588.go @@ -11,10 +11,10 @@ package p -type F func(b T) // ERROR "T is not a type" +type F func(b T) // ERROR "T is not a type" func T(fn F) { - func() { - fn(nil) // If Decldepth is not initialized properly, typecheckclosure() Fatals here. - }() + func() { + fn(nil) // If Decldepth is not initialized properly, typecheckclosure() Fatals here. + }() } diff --git a/test/fixedbugs/issue17645.go b/test/fixedbugs/issue17645.go index ed92c54cfabb3..0fc495c851de0 100644 --- a/test/fixedbugs/issue17645.go +++ b/test/fixedbugs/issue17645.go @@ -12,6 +12,5 @@ type Foo struct { func main() { var s []int - var _ string = append(s, Foo{""}) // ERROR "cannot use .. \(type string\) as type int in field value" "cannot use Foo literal \(type Foo\) as type int in append" "cannot use append\(s\, Foo literal\) \(type \[\]int\) as type string in assignment" + var _ string = append(s, Foo{""}) // ERROR "cannot use .. \(type string\) as type int in field value" "cannot use Foo literal \(type Foo\) as type int in append" "cannot use append\(s\, Foo literal\) \(type \[\]int\) as type string in assignment" } - diff --git a/test/fixedbugs/issue18231.go b/test/fixedbugs/issue18231.go index adfd2277ffe2e..972c0f28a7d16 100644 --- a/test/fixedbugs/issue18231.go +++ b/test/fixedbugs/issue18231.go @@ -14,7 +14,7 @@ type T struct { } var _ = T{ - f: { // ERROR "missing type in composite literal" + f: { // ERROR "missing type in composite literal" "a": "b", }, } diff --git a/test/fixedbugs/issue18808.go b/test/fixedbugs/issue18808.go index c98386ee7847e..8e1a55471da2c 100644 --- a/test/fixedbugs/issue18808.go +++ b/test/fixedbugs/issue18808.go @@ -56,8 +56,8 @@ func lte(x uint32) { func main() { eq(lim) neq(lim) - gt(lim+1) - gte(lim+1) - lt(lim+1) - lte(lim+1) + gt(lim + 1) + gte(lim + 1) + lt(lim + 1) + lte(lim + 1) } diff --git a/test/fixedbugs/issue19028.dir/main.go b/test/fixedbugs/issue19028.dir/main.go index 627e926f9370a..ca2cf8c694b8b 100644 --- a/test/fixedbugs/issue19028.dir/main.go +++ b/test/fixedbugs/issue19028.dir/main.go @@ -5,12 +5,12 @@ package main import ( - "reflect" - fake "./reflect" // 2nd package with name "reflect" + fake "./reflect" // 2nd package with name "reflect" + "reflect" ) type T struct { - _ fake.Type + _ fake.Type } func (T) f() {} @@ -18,9 +18,9 @@ func (T) G() (_ int) { return } func (T) H() (_, _ int) { return } func main() { - var x T - typ := reflect.TypeOf(x) - for i := 0; i < typ.NumMethod(); i++ { - _ = typ.Method(i) // must not crash - } + var x T + typ := reflect.TypeOf(x) + for i := 0; i < typ.NumMethod(); i++ { + _ = typ.Method(i) // must not crash + } } diff --git a/test/fixedbugs/issue19515.go b/test/fixedbugs/issue19515.go index a1605bec96335..8a230485f5508 100644 --- a/test/fixedbugs/issue19515.go +++ b/test/fixedbugs/issue19515.go @@ -48,4 +48,3 @@ func (v *VScrollPanel) Draw() { BoxGradient(x+x-2, y-1, 0, 0, 0, Color{}, Color{}) BoxGradient(x+y-2, y-1, 0, 0, 0, Color{}, Color{}) } - diff --git a/test/fixedbugs/issue19764.dir/a.go b/test/fixedbugs/issue19764.dir/a.go index 64538e5bdf056..7467d03a40707 100644 --- a/test/fixedbugs/issue19764.dir/a.go +++ b/test/fixedbugs/issue19764.dir/a.go @@ -5,9 +5,10 @@ package a type T struct{ _ int } + func (t T) M() {} -type I interface { M() } +type I interface{ M() } func F() { var t I = &T{} diff --git a/test/fixedbugs/issue20602.go b/test/fixedbugs/issue20602.go index ca4ce095aa20f..c938ca3006754 100644 --- a/test/fixedbugs/issue20602.go +++ b/test/fixedbugs/issue20602.go @@ -10,5 +10,5 @@ package p var p = &[1]complex128{0} -var _ = real(p) // ERROR "type \*\[1\]complex128" -var _ = imag(p) // ERROR "type \*\[1\]complex128" +var _ = real(p) // ERROR "type \*\[1\]complex128" +var _ = imag(p) // ERROR "type \*\[1\]complex128" diff --git a/test/fixedbugs/issue20811.go b/test/fixedbugs/issue20811.go index 96b61ec728912..2ccf453a1446f 100644 --- a/test/fixedbugs/issue20811.go +++ b/test/fixedbugs/issue20811.go @@ -20,4 +20,3 @@ func main() { func g() int64 { return 4398046511104 } - diff --git a/test/fixedbugs/issue22429.go b/test/fixedbugs/issue22429.go index 289b434a74ced..03c007f2aa11a 100644 --- a/test/fixedbugs/issue22429.go +++ b/test/fixedbugs/issue22429.go @@ -9,10 +9,10 @@ package p type T struct { - a,b,c,d float32 + a, b, c, d float32 } -func f(a *[8]T, i,j,k int) float32 { +func f(a *[8]T, i, j, k int) float32 { b := *a return b[i].a + b[j].b + b[k].c } diff --git a/test/fixedbugs/issue22458.go b/test/fixedbugs/issue22458.go index 5c899295771da..9317bcfdbd7c7 100644 --- a/test/fixedbugs/issue22458.go +++ b/test/fixedbugs/issue22458.go @@ -11,16 +11,16 @@ package main import "runtime" type node struct { - next *node + next *node } var x bool func main() { - var head *node - for x { - head = &node{head} - } + var head *node + for x { + head = &node{head} + } - runtime.KeepAlive(head) + runtime.KeepAlive(head) } diff --git a/test/fixedbugs/issue22662.go b/test/fixedbugs/issue22662.go index a1f00bfac3104..a3bbb7b7cfd76 100644 --- a/test/fixedbugs/issue22662.go +++ b/test/fixedbugs/issue22662.go @@ -25,7 +25,7 @@ func check(file string, line int) { } func main() { -//-style line directives + //-style line directives //line :1 check("??", 1) // no file specified //line foo.go:1 @@ -35,12 +35,16 @@ func main() { //line :11:22 check("bar.go", 11) // no file, but column specified => keep old filename -/*-style line directives */ -/*line :1*/ check("??", 1) // no file specified -/*line foo.go:1*/ check("foo.go", 1) -/*line bar.go:10:20*/ check("bar.go", 10) -/*line :11:22*/ check("bar.go", 11) // no file, but column specified => keep old filename - - /*line :10*/ check("??", 10); /*line foo.go:20*/ check("foo.go", 20); /*line :30:1*/ check("foo.go", 30) + /*-style line directives */ + /*line :1*/ + check("??", 1) // no file specified + /*line foo.go:1*/ check("foo.go", 1) + /*line bar.go:10:20*/ check("bar.go", 10) + /*line :11:22*/ check("bar.go", 11) // no file, but column specified => keep old filename + + /*line :10*/ + check("??", 10) /*line foo.go:20*/ + check("foo.go", 20) /*line :30:1*/ + check("foo.go", 30) check("foo.go", 31) } diff --git a/test/fixedbugs/issue24339.go b/test/fixedbugs/issue24339.go index 0670becdfe1ea..308fa758253ba 100644 --- a/test/fixedbugs/issue24339.go +++ b/test/fixedbugs/issue24339.go @@ -9,12 +9,6 @@ package p // Use a diffent line number for each token so we can // check that the error message appears at the correct // position. -var _ = struct{}{ /*line :20:1*/foo /*line :21:1*/: /*line :22:1*/0 } +var _ = struct{}{ /*line :20:1*/ foo /*line :21:1*/ : /*line :22:1*/ 0} - - - - - - -// ERROR "unknown field 'foo'" \ No newline at end of file +// ERROR "unknown field 'foo'" diff --git a/test/fixedbugs/issue24799.go b/test/fixedbugs/issue24799.go index c805c86dda8d7..70f8def24d310 100644 --- a/test/fixedbugs/issue24799.go +++ b/test/fixedbugs/issue24799.go @@ -10,7 +10,7 @@ package main import ( - "fmt" + "fmt" ) type Level string @@ -20,39 +20,39 @@ type Level string // not aligned to 4 bytes due to the type of relocation that // is generated for the instruction. A fix was made to avoid // generating an instruction with DS relocation for go.strings -// since their alignment is not known until link time. +// since their alignment is not known until link time. // This problem only affects go.string since other types have // correct alignment. const ( - LevelBad Level = "badvals" - LevelNone Level = "No" - LevelMetadata Level = "Metadata" - LevelRequest Level = "Request" - LevelRequestResponse Level = "RequestResponse" + LevelBad Level = "badvals" + LevelNone Level = "No" + LevelMetadata Level = "Metadata" + LevelRequest Level = "Request" + LevelRequestResponse Level = "RequestResponse" ) func ordLevel(l Level) int { - switch l { - case LevelMetadata: - return 1 - case LevelRequest: - return 2 - case LevelRequestResponse: - return 3 - default: - return 0 - } + switch l { + case LevelMetadata: + return 1 + case LevelRequest: + return 2 + case LevelRequestResponse: + return 3 + default: + return 0 + } } //go:noinline func test(l Level) { - if ordLevel(l) < ordLevel(LevelMetadata) { - fmt.Printf("OK\n") - } + if ordLevel(l) < ordLevel(LevelMetadata) { + fmt.Printf("OK\n") + } } func main() { - test(LevelMetadata) + test(LevelMetadata) } diff --git a/test/fixedbugs/issue3552.dir/one.go b/test/fixedbugs/issue3552.dir/one.go index e594db7478bbf..dacd2565da230 100644 --- a/test/fixedbugs/issue3552.dir/one.go +++ b/test/fixedbugs/issue3552.dir/one.go @@ -6,23 +6,20 @@ package one // Issue 3552 -type T struct { int } +type T struct{ int } func (t T) F() int { return t.int } -type U struct { int int } +type U struct{ int int } func (u U) F() int { return u.int } type lint int -type V struct { lint } +type V struct{ lint } func (v V) F() int { return int(v.lint) } -type W struct { lint lint } +type W struct{ lint lint } func (w W) F() int { return int(w.lint) } - - - diff --git a/test/fixedbugs/issue3783.go b/test/fixedbugs/issue3783.go index 7db06d1881dcd..b60b4b3ee0516 100644 --- a/test/fixedbugs/issue3783.go +++ b/test/fixedbugs/issue3783.go @@ -9,4 +9,3 @@ package foo var i int func (*i) bar() // ERROR "not a type|expected type" - diff --git a/test/fixedbugs/issue3925.go b/test/fixedbugs/issue3925.go index 628c222685efb..a8c73a3d65101 100644 --- a/test/fixedbugs/issue3925.go +++ b/test/fixedbugs/issue3925.go @@ -11,7 +11,7 @@ package foo var _ = map[string]string{ - "1": "2", + "1": "2", "3", "4", // ERROR "missing key|must have keys" } @@ -20,4 +20,3 @@ var _ = []string{ "bar", 20, // ERROR "cannot use|incompatible type" } - diff --git a/test/fixedbugs/issue4097.go b/test/fixedbugs/issue4097.go index 30b65bce8335d..a3c9fea8cb147 100644 --- a/test/fixedbugs/issue4097.go +++ b/test/fixedbugs/issue4097.go @@ -7,5 +7,5 @@ package foo var s [][10]int -const m = len(s[len(s)-1]) // ERROR "is not a constant|is not constant" +const m = len(s[len(s)-1]) // ERROR "is not a constant|is not constant" diff --git a/test/fixedbugs/issue4099.go b/test/fixedbugs/issue4099.go index 8ea809c2149e1..aae38357ad683 100644 --- a/test/fixedbugs/issue4099.go +++ b/test/fixedbugs/issue4099.go @@ -20,7 +20,7 @@ func F2([]byte) func G() { var buf1 [10]byte F1(buf1[:]) // ERROR "buf1 does not escape" - + var buf2 [10]byte // ERROR "moved to heap: buf2" - F2(buf2[:]) // ERROR "buf2 escapes to heap" + F2(buf2[:]) // ERROR "buf2 escapes to heap" } diff --git a/test/fixedbugs/issue4162.go b/test/fixedbugs/issue4162.go index f236bd0f6a875..23b93e5841189 100644 --- a/test/fixedbugs/issue4162.go +++ b/test/fixedbugs/issue4162.go @@ -10,8 +10,8 @@ package p // All these are valid now. var ( - _ = int(1.0,) // comma was always permitted (like function call) - _ = []byte("foo",) // was syntax error: unexpected comma - _ = chan int(nil,) // was syntax error: unexpected comma - _ = (func())(nil,) // was syntax error: unexpected comma + _ = int(1.0) // comma was always permitted (like function call) + _ = []byte("foo") // was syntax error: unexpected comma + _ = chan int(nil) // was syntax error: unexpected comma + _ = (func())(nil) // was syntax error: unexpected comma ) diff --git a/test/fixedbugs/issue4251.go b/test/fixedbugs/issue4251.go index d11ce51b97109..b3434d7ff635c 100644 --- a/test/fixedbugs/issue4251.go +++ b/test/fixedbugs/issue4251.go @@ -9,13 +9,13 @@ package p func F1(s []byte) []byte { - return s[2:1] // ERROR "invalid slice index|inverted slice range" + return s[2:1] // ERROR "invalid slice index|inverted slice range" } func F2(a [10]byte) []byte { - return a[2:1] // ERROR "invalid slice index|inverted slice range" + return a[2:1] // ERROR "invalid slice index|inverted slice range" } func F3(s string) string { - return s[2:1] // ERROR "invalid slice index|inverted slice range" + return s[2:1] // ERROR "invalid slice index|inverted slice range" } diff --git a/test/fixedbugs/issue4264.go b/test/fixedbugs/issue4264.go index 627393211ee8c..f550c95e719a0 100644 --- a/test/fixedbugs/issue4264.go +++ b/test/fixedbugs/issue4264.go @@ -13,7 +13,7 @@ func main() { var y float64 var z complex128 - println(x/0) // ERROR "division by zero" - println(y/0) - println(z/0) -} \ No newline at end of file + println(x / 0) // ERROR "division by zero" + println(y / 0) + println(z / 0) +} diff --git a/test/fixedbugs/issue4283.go b/test/fixedbugs/issue4283.go index fa5629b20a9f8..5d695388434d1 100644 --- a/test/fixedbugs/issue4283.go +++ b/test/fixedbugs/issue4283.go @@ -9,9 +9,9 @@ package p func F1() bool { - return nil == nil // ERROR "invalid" + return nil == nil // ERROR "invalid" } func F2() bool { - return nil != nil // ERROR "invalid" + return nil != nil // ERROR "invalid" } diff --git a/test/fixedbugs/issue4313.go b/test/fixedbugs/issue4313.go index 2494b83b03bbd..ad45f60a5be06 100644 --- a/test/fixedbugs/issue4313.go +++ b/test/fixedbugs/issue4313.go @@ -22,7 +22,10 @@ func main() { } func makec(px *int) chan bool { - if false { for {} } + if false { + for { + } + } *px = 42 return make(chan bool, 0) } diff --git a/test/fixedbugs/issue4326.dir/q1.go b/test/fixedbugs/issue4326.dir/q1.go index f118eb09252a4..f1a0d18ea842f 100644 --- a/test/fixedbugs/issue4326.dir/q1.go +++ b/test/fixedbugs/issue4326.dir/q1.go @@ -1,8 +1,8 @@ package q1 func Deref(typ interface{}) interface{} { - if typ, ok := typ.(*int); ok { - return *typ - } - return typ + if typ, ok := typ.(*int); ok { + return *typ + } + return typ } diff --git a/test/fixedbugs/issue4326.dir/q2.go b/test/fixedbugs/issue4326.dir/q2.go index 075e2b21e7a43..2bcc0e224d063 100644 --- a/test/fixedbugs/issue4326.dir/q2.go +++ b/test/fixedbugs/issue4326.dir/q2.go @@ -3,9 +3,9 @@ package main import "./q1" func main() { - x := 1 - y := q1.Deref(&x) - if y != 1 { - panic("y != 1") - } + x := 1 + y := q1.Deref(&x) + if y != 1 { + panic("y != 1") + } } diff --git a/test/fixedbugs/issue4365.go b/test/fixedbugs/issue4365.go index 09ff1bf8f7f3f..9b4a7641b15af 100644 --- a/test/fixedbugs/issue4365.go +++ b/test/fixedbugs/issue4365.go @@ -10,7 +10,7 @@ package main type T interface { - M() + M() } type M struct{} @@ -18,10 +18,10 @@ type M struct{} func (M) M() {} type Foo struct { - M + M } func main() { - var v T = Foo{} // ERROR "has no methods|not a method|cannot use" - _ = v + var v T = Foo{} // ERROR "has no methods|not a method|cannot use" + _ = v } diff --git a/test/fixedbugs/issue4396a.go b/test/fixedbugs/issue4396a.go index 38dd4b8cfb37a..12f4212d7687b 100644 --- a/test/fixedbugs/issue4396a.go +++ b/test/fixedbugs/issue4396a.go @@ -8,7 +8,7 @@ // word aligned. 5g should use MOVB to load the address // of s.g[0] for its nil check. // -// This test _may_ fail on arm, but requires the host to +// This test _may_ fail on arm, but requires the host to // trap unaligned loads. This is generally done with // // echo "4" > /proc/cpu/alignment diff --git a/test/fixedbugs/issue4396b.go b/test/fixedbugs/issue4396b.go index 1284870ece654..1281284d1717c 100644 --- a/test/fixedbugs/issue4396b.go +++ b/test/fixedbugs/issue4396b.go @@ -17,7 +17,7 @@ type T struct { } type T2 struct { - pad [4096]byte + pad [4096]byte A, B byte } diff --git a/test/fixedbugs/issue4429.go b/test/fixedbugs/issue4429.go index 9eb2e0f9c2ad3..7b2c92a7bcadb 100644 --- a/test/fixedbugs/issue4429.go +++ b/test/fixedbugs/issue4429.go @@ -7,10 +7,10 @@ package p type a struct { - a int + a int } func main() { - av := a{}; - _ = *a(av); // ERROR "invalid indirect|expected pointer" + av := a{} + _ = *a(av) // ERROR "invalid indirect|expected pointer" } diff --git a/test/fixedbugs/issue4463.go b/test/fixedbugs/issue4463.go index 6ad1952d672f3..500b4975e6175 100644 --- a/test/fixedbugs/issue4463.go +++ b/test/fixedbugs/issue4463.go @@ -17,17 +17,17 @@ func F() { var m map[int]int var s struct{ f int } - append(a, 0) // ERROR "not used" - cap(a) // ERROR "not used" - complex(1, 2) // ERROR "not used" - imag(1i) // ERROR "not used" - len(a) // ERROR "not used" - make([]int, 10) // ERROR "not used" - new(int) // ERROR "not used" - real(1i) // ERROR "not used" - unsafe.Alignof(a) // ERROR "not used" - unsafe.Offsetof(s.f) // ERROR "not used" - unsafe.Sizeof(a) // ERROR "not used" + append(a, 0) // ERROR "not used" + cap(a) // ERROR "not used" + complex(1, 2) // ERROR "not used" + imag(1i) // ERROR "not used" + len(a) // ERROR "not used" + make([]int, 10) // ERROR "not used" + new(int) // ERROR "not used" + real(1i) // ERROR "not used" + unsafe.Alignof(a) // ERROR "not used" + unsafe.Offsetof(s.f) // ERROR "not used" + unsafe.Sizeof(a) // ERROR "not used" close(c) copy(a, a) @@ -45,17 +45,17 @@ func F() { (println("bar")) (recover()) - go append(a, 0) // ERROR "not used|discards result" - go cap(a) // ERROR "not used|discards result" - go complex(1, 2) // ERROR "not used|discards result" - go imag(1i) // ERROR "not used|discards result" - go len(a) // ERROR "not used|discards result" - go make([]int, 10) // ERROR "not used|discards result" - go new(int) // ERROR "not used|discards result" - go real(1i) // ERROR "not used|discards result" - go unsafe.Alignof(a) // ERROR "not used|discards result" - go unsafe.Offsetof(s.f) // ERROR "not used|discards result" - go unsafe.Sizeof(a) // ERROR "not used|discards result" + go append(a, 0) // ERROR "not used|discards result" + go cap(a) // ERROR "not used|discards result" + go complex(1, 2) // ERROR "not used|discards result" + go imag(1i) // ERROR "not used|discards result" + go len(a) // ERROR "not used|discards result" + go make([]int, 10) // ERROR "not used|discards result" + go new(int) // ERROR "not used|discards result" + go real(1i) // ERROR "not used|discards result" + go unsafe.Alignof(a) // ERROR "not used|discards result" + go unsafe.Offsetof(s.f) // ERROR "not used|discards result" + go unsafe.Sizeof(a) // ERROR "not used|discards result" go close(c) go copy(a, a) @@ -65,17 +65,17 @@ func F() { go println("bar") go recover() - defer append(a, 0) // ERROR "not used|discards result" - defer cap(a) // ERROR "not used|discards result" - defer complex(1, 2) // ERROR "not used|discards result" - defer imag(1i) // ERROR "not used|discards result" - defer len(a) // ERROR "not used|discards result" - defer make([]int, 10) // ERROR "not used|discards result" - defer new(int) // ERROR "not used|discards result" - defer real(1i) // ERROR "not used|discards result" - defer unsafe.Alignof(a) // ERROR "not used|discards result" - defer unsafe.Offsetof(s.f) // ERROR "not used|discards result" - defer unsafe.Sizeof(a) // ERROR "not used|discards result" + defer append(a, 0) // ERROR "not used|discards result" + defer cap(a) // ERROR "not used|discards result" + defer complex(1, 2) // ERROR "not used|discards result" + defer imag(1i) // ERROR "not used|discards result" + defer len(a) // ERROR "not used|discards result" + defer make([]int, 10) // ERROR "not used|discards result" + defer new(int) // ERROR "not used|discards result" + defer real(1i) // ERROR "not used|discards result" + defer unsafe.Alignof(a) // ERROR "not used|discards result" + defer unsafe.Offsetof(s.f) // ERROR "not used|discards result" + defer unsafe.Sizeof(a) // ERROR "not used|discards result" defer close(c) defer copy(a, a) diff --git a/test/fixedbugs/issue4470.go b/test/fixedbugs/issue4470.go index d92247845585a..f84a5409b7168 100644 --- a/test/fixedbugs/issue4470.go +++ b/test/fixedbugs/issue4470.go @@ -10,7 +10,7 @@ package main func main() { var i interface{} - switch (i.(type)) { // ERROR "outside type switch" + switch i.(type) { // ERROR "outside type switch" default: } } diff --git a/test/fixedbugs/issue4495.go b/test/fixedbugs/issue4495.go index 308acc2280128..8f90809501da6 100644 --- a/test/fixedbugs/issue4495.go +++ b/test/fixedbugs/issue4495.go @@ -26,4 +26,3 @@ func main() { panic("ret != 3") } } - diff --git a/test/fixedbugs/issue4562.go b/test/fixedbugs/issue4562.go index 8c958f5725d66..94280359b09bb 100644 --- a/test/fixedbugs/issue4562.go +++ b/test/fixedbugs/issue4562.go @@ -34,7 +34,7 @@ func expectError(expectLine int) { if recover() == nil { panic("did not crash") } - for i := 1;; i++ { + for i := 1; ; i++ { _, file, line, ok := runtime.Caller(i) if !ok { panic("cannot find issue4562.go on stack") diff --git a/test/fixedbugs/issue4610.go b/test/fixedbugs/issue4610.go index d56c6d3e8cd89..8993f9882bd84 100644 --- a/test/fixedbugs/issue4610.go +++ b/test/fixedbugs/issue4610.go @@ -14,4 +14,3 @@ func main() { var foo bar _ = &foo{} // ERROR "is not a type|expected .;." } // GCCGO_ERROR "expected declaration" - diff --git a/test/fixedbugs/issue4618.go b/test/fixedbugs/issue4618.go index 0ba95230cf335..fe43aa828d100 100644 --- a/test/fixedbugs/issue4618.go +++ b/test/fixedbugs/issue4618.go @@ -13,7 +13,7 @@ import ( "testing" ) -type T struct { int } +type T struct{ int } var globl *T diff --git a/test/fixedbugs/issue4620.go b/test/fixedbugs/issue4620.go index 5aa29086f79a3..20d641d3f445f 100644 --- a/test/fixedbugs/issue4620.go +++ b/test/fixedbugs/issue4620.go @@ -11,7 +11,7 @@ package main import "fmt" func main() { - m := map[int]int{0:1} + m := map[int]int{0: 1} i := 0 i, m[i] = 1, 2 if m[0] != 2 { diff --git a/test/fixedbugs/issue4654.go b/test/fixedbugs/issue4654.go index 76aff76a67803..595782f95332f 100644 --- a/test/fixedbugs/issue4654.go +++ b/test/fixedbugs/issue4654.go @@ -12,60 +12,60 @@ package p import "unsafe" func f() { - defer int(0) // ERROR "defer requires function call, not conversion|is not used" + defer int(0) // ERROR "defer requires function call, not conversion|is not used" go string([]byte("abc")) // ERROR "go requires function call, not conversion|is not used" - + var c complex128 var f float64 - var t struct {X int} + var t struct{ X int } var x []int - defer append(x, 1) // ERROR "defer discards result of append|is not used" - defer cap(x) // ERROR "defer discards result of cap|is not used" - defer complex(1, 2) // ERROR "defer discards result of complex|is not used" - defer complex(f, 1) // ERROR "defer discards result of complex|is not used" - defer imag(1i) // ERROR "defer discards result of imag|is not used" - defer imag(c) // ERROR "defer discards result of imag|is not used" - defer len(x) // ERROR "defer discards result of len|is not used" - defer make([]int, 1) // ERROR "defer discards result of make|is not used" - defer make(chan bool) // ERROR "defer discards result of make|is not used" + defer append(x, 1) // ERROR "defer discards result of append|is not used" + defer cap(x) // ERROR "defer discards result of cap|is not used" + defer complex(1, 2) // ERROR "defer discards result of complex|is not used" + defer complex(f, 1) // ERROR "defer discards result of complex|is not used" + defer imag(1i) // ERROR "defer discards result of imag|is not used" + defer imag(c) // ERROR "defer discards result of imag|is not used" + defer len(x) // ERROR "defer discards result of len|is not used" + defer make([]int, 1) // ERROR "defer discards result of make|is not used" + defer make(chan bool) // ERROR "defer discards result of make|is not used" defer make(map[string]int) // ERROR "defer discards result of make|is not used" - defer new(int) // ERROR "defer discards result of new|is not used" - defer real(1i) // ERROR "defer discards result of real|is not used" - defer real(c) // ERROR "defer discards result of real|is not used" - defer append(x, 1) // ERROR "defer discards result of append|is not used" - defer append(x, 1) // ERROR "defer discards result of append|is not used" - defer unsafe.Alignof(t.X) // ERROR "defer discards result of unsafe.Alignof|is not used" + defer new(int) // ERROR "defer discards result of new|is not used" + defer real(1i) // ERROR "defer discards result of real|is not used" + defer real(c) // ERROR "defer discards result of real|is not used" + defer append(x, 1) // ERROR "defer discards result of append|is not used" + defer append(x, 1) // ERROR "defer discards result of append|is not used" + defer unsafe.Alignof(t.X) // ERROR "defer discards result of unsafe.Alignof|is not used" defer unsafe.Offsetof(t.X) // ERROR "defer discards result of unsafe.Offsetof|is not used" - defer unsafe.Sizeof(t) // ERROR "defer discards result of unsafe.Sizeof|is not used" - + defer unsafe.Sizeof(t) // ERROR "defer discards result of unsafe.Sizeof|is not used" + defer copy(x, x) // ok m := make(map[int]int) defer delete(m, 1) // ok - defer panic(1) // ok - defer print(1) // ok - defer println(1) // ok - defer recover() // ok + defer panic(1) // ok + defer print(1) // ok + defer println(1) // ok + defer recover() // ok - int(0) // ERROR "int\(0\) evaluated but not used|is not used" + int(0) // ERROR "int\(0\) evaluated but not used|is not used" string([]byte("abc")) // ERROR "string\(.*\) evaluated but not used|is not used" - append(x, 1) // ERROR "not used" - cap(x) // ERROR "not used" - complex(1, 2) // ERROR "not used" - complex(f, 1) // ERROR "not used" - imag(1i) // ERROR "not used" - imag(c) // ERROR "not used" - len(x) // ERROR "not used" - make([]int, 1) // ERROR "not used" - make(chan bool) // ERROR "not used" + append(x, 1) // ERROR "not used" + cap(x) // ERROR "not used" + complex(1, 2) // ERROR "not used" + complex(f, 1) // ERROR "not used" + imag(1i) // ERROR "not used" + imag(c) // ERROR "not used" + len(x) // ERROR "not used" + make([]int, 1) // ERROR "not used" + make(chan bool) // ERROR "not used" make(map[string]int) // ERROR "not used" - new(int) // ERROR "not used" - real(1i) // ERROR "not used" - real(c) // ERROR "not used" - append(x, 1) // ERROR "not used" - append(x, 1) // ERROR "not used" - unsafe.Alignof(t.X) // ERROR "not used" + new(int) // ERROR "not used" + real(1i) // ERROR "not used" + real(c) // ERROR "not used" + append(x, 1) // ERROR "not used" + append(x, 1) // ERROR "not used" + unsafe.Alignof(t.X) // ERROR "not used" unsafe.Offsetof(t.X) // ERROR "not used" - unsafe.Sizeof(t) // ERROR "not used" + unsafe.Sizeof(t) // ERROR "not used" } diff --git a/test/fixedbugs/issue4663.go b/test/fixedbugs/issue4663.go index 971290d8ddf87..2533f0f269d5f 100644 --- a/test/fixedbugs/issue4663.go +++ b/test/fixedbugs/issue4663.go @@ -10,6 +10,6 @@ package main func a(b int) int64 { - b // ERROR "not used" - return 0 + b // ERROR "not used" + return 0 } diff --git a/test/fixedbugs/issue4748.go b/test/fixedbugs/issue4748.go index f7c77cf882f3f..7a9deca039d97 100644 --- a/test/fixedbugs/issue4748.go +++ b/test/fixedbugs/issue4748.go @@ -10,11 +10,11 @@ package main func jump() { - goto exit + goto exit exit: - return + return } func main() { - jump() - jump() + jump() + jump() } diff --git a/test/fixedbugs/issue4879.dir/a.go b/test/fixedbugs/issue4879.dir/a.go index 7ee7c4860475f..9bfb0c7d4fc3f 100644 --- a/test/fixedbugs/issue4879.dir/a.go +++ b/test/fixedbugs/issue4879.dir/a.go @@ -30,4 +30,3 @@ func MakePrivateCollection3() *Collection { root: unsafe.Pointer(&maptype{}), } } - diff --git a/test/fixedbugs/issue4879.dir/b.go b/test/fixedbugs/issue4879.dir/b.go index d8fb5693db903..62dcb36e21f0e 100644 --- a/test/fixedbugs/issue4879.dir/b.go +++ b/test/fixedbugs/issue4879.dir/b.go @@ -3,7 +3,7 @@ package b import "./a" func F() { - a.MakePrivateCollection() - a.MakePrivateCollection2() - a.MakePrivateCollection3() + a.MakePrivateCollection() + a.MakePrivateCollection2() + a.MakePrivateCollection3() } diff --git a/test/fixedbugs/issue5056.go b/test/fixedbugs/issue5056.go index 6fb444aa67958..d43bbbee1f341 100644 --- a/test/fixedbugs/issue5056.go +++ b/test/fixedbugs/issue5056.go @@ -10,7 +10,7 @@ package main type Foo int16 -func (f Foo) Esc() *int{ +func (f Foo) Esc() *int { x := int(f) return &x } @@ -24,7 +24,7 @@ var bar, foobar *int func main() { var quux iface var x Foo - + quux = x bar = quux.Esc() foobar = quux.Esc() diff --git a/test/fixedbugs/issue5089.go b/test/fixedbugs/issue5089.go index 9f7fa5a4d452c..f5492a918e4e8 100644 --- a/test/fixedbugs/issue5089.go +++ b/test/fixedbugs/issue5089.go @@ -8,7 +8,7 @@ package p -import "bufio" // GCCGO_ERROR "previous" +import "bufio" // GCCGO_ERROR "previous" func (b *bufio.Reader) Buffered() int { // ERROR "non-local|redefinition" return -1 diff --git a/test/fixedbugs/issue5172.go b/test/fixedbugs/issue5172.go index a6acbd3db7892..4a29dd1812eb9 100644 --- a/test/fixedbugs/issue5172.go +++ b/test/fixedbugs/issue5172.go @@ -14,6 +14,6 @@ type foo struct { func main() { var f foo - go f.bar() // GCCGO_ERROR "undefined" - defer f.bar() // GCCGO_ERROR "undefined" + go f.bar() // GCCGO_ERROR "undefined" + defer f.bar() // GCCGO_ERROR "undefined" } diff --git a/test/fixedbugs/issue5493.go b/test/fixedbugs/issue5493.go index 2ee0398af2c89..ee7a0dc0717d3 100644 --- a/test/fixedbugs/issue5493.go +++ b/test/fixedbugs/issue5493.go @@ -14,6 +14,7 @@ import ( ) const N = 10 + var count int64 func run() error { @@ -56,4 +57,3 @@ func main() { panic("not all finalizers are called") } } - diff --git a/test/fixedbugs/issue5515.go b/test/fixedbugs/issue5515.go index 053abf6f7cffa..2dab1eaab3c59 100644 --- a/test/fixedbugs/issue5515.go +++ b/test/fixedbugs/issue5515.go @@ -11,24 +11,24 @@ package main type T uint32 func main() { - b := make([]T, 8) - b[0] = 0xdeadbeef - rs := Slice(b) - sort(rs) + b := make([]T, 8) + b[0] = 0xdeadbeef + rs := Slice(b) + sort(rs) } type Slice []T func (s Slice) Swap(i, j int) { - tmp := s[i] - s[i] = s[j] - s[j] = tmp + tmp := s[i] + s[i] = s[j] + s[j] = tmp } type Interface interface { - Swap(i, j int) + Swap(i, j int) } func sort(data Interface) { - data.Swap(0, 4) + data.Swap(0, 4) } diff --git a/test/fixedbugs/issue5614.dir/x.go b/test/fixedbugs/issue5614.dir/x.go index 7e4f3a7e6b9bb..6cd0969db8a8a 100644 --- a/test/fixedbugs/issue5614.dir/x.go +++ b/test/fixedbugs/issue5614.dir/x.go @@ -3,5 +3,3 @@ package x import "./rethinkgo" var S *rethinkgo.Session - - diff --git a/test/fixedbugs/issue5753.go b/test/fixedbugs/issue5753.go index 230a1e8c3bd40..597fd2f58cc5d 100644 --- a/test/fixedbugs/issue5753.go +++ b/test/fixedbugs/issue5753.go @@ -25,5 +25,5 @@ func main() { if s[0] != "foo" { panic(`s[0] != "foo"`) } - + } diff --git a/test/fixedbugs/issue5809.go b/test/fixedbugs/issue5809.go index fc8eeef82fa03..e63515f67882a 100644 --- a/test/fixedbugs/issue5809.go +++ b/test/fixedbugs/issue5809.go @@ -14,13 +14,13 @@ func main() { const d16 = "0123456789ABCDEF" k := 0x1234 var x [4]byte - + x[0] = d16[k>>12&0xf] x[1] = d16[k>>8&0xf] x[2] = d16[k>>4&0xf] x[3] = d16[k&0xf] - - if x != [4]byte{'1','2','3','4'} { + + if x != [4]byte{'1', '2', '3', '4'} { fmt.Println(x) panic("x != [4]byte{'1','2','3','4'}") } diff --git a/test/fixedbugs/issue5957.dir/b.go b/test/fixedbugs/issue5957.dir/b.go index 9bc561b9ce5ac..674bcbc006124 100644 --- a/test/fixedbugs/issue5957.dir/b.go +++ b/test/fixedbugs/issue5957.dir/b.go @@ -1,2 +1 @@ package surprise2 - diff --git a/test/fixedbugs/issue5957.dir/c.go b/test/fixedbugs/issue5957.dir/c.go index d115eacdd5642..28f6e84a59f95 100644 --- a/test/fixedbugs/issue5957.dir/c.go +++ b/test/fixedbugs/issue5957.dir/c.go @@ -1,12 +1,12 @@ package p import ( - "./a" // ERROR "imported and not used: \x22a\x22 as surprise|imported and not used: surprise" - "./b" // ERROR "imported and not used: \x22b\x22 as surprise2|imported and not used: surprise2" - b "./b" // ERROR "imported and not used: \x22b\x22$|imported and not used: surprise2" + "./a" // ERROR "imported and not used: \x22a\x22 as surprise|imported and not used: surprise" + "./b" // ERROR "imported and not used: \x22b\x22 as surprise2|imported and not used: surprise2" + b "./b" // ERROR "imported and not used: \x22b\x22$|imported and not used: surprise2" + "fmt" // actually used foo "math" // ERROR "imported and not used: \x22math\x22 as foo|imported and not used: math" - "fmt" // actually used - "strings" // ERROR "imported and not used: \x22strings\x22|imported and not used: strings" + "strings" // ERROR "imported and not used: \x22strings\x22|imported and not used: strings" ) var _ = fmt.Printf diff --git a/test/fixedbugs/issue6004.go b/test/fixedbugs/issue6004.go index 2b3dcd923d6a6..4a4a43cf94842 100644 --- a/test/fixedbugs/issue6004.go +++ b/test/fixedbugs/issue6004.go @@ -7,9 +7,8 @@ package main func main() { - _ = nil // ERROR "use of untyped nil" - _, _ = nil, 1 // ERROR "use of untyped nil" - _, _ = 1, nil // ERROR "use of untyped nil" + _ = nil // ERROR "use of untyped nil" + _, _ = nil, 1 // ERROR "use of untyped nil" + _, _ = 1, nil // ERROR "use of untyped nil" _ = append(nil, 1, 2, 3) // ERROR "untyped nil" } - diff --git a/test/fixedbugs/issue6406.go b/test/fixedbugs/issue6406.go index 5491193ef31b5..429aa7f5f3ea6 100644 --- a/test/fixedbugs/issue6406.go +++ b/test/fixedbugs/issue6406.go @@ -8,5 +8,5 @@ package main func main() { s = "bob" // ERROR "undefined.*s" - _ = s // ERROR "undefined.*s" + _ = s // ERROR "undefined.*s" } diff --git a/test/fixedbugs/issue6703g.go b/test/fixedbugs/issue6703g.go index 05ec7405f3f9e..1762d0bc424e8 100644 --- a/test/fixedbugs/issue6703g.go +++ b/test/fixedbugs/issue6703g.go @@ -17,4 +17,4 @@ func (T) m() int { type E struct{ T } -var x = E.m // ERROR "initialization loop|depends upon itself" +var x = E.m // ERROR "initialization loop|depends upon itself" diff --git a/test/fixedbugs/issue6703h.go b/test/fixedbugs/issue6703h.go index f6b69e1b70b14..af0cdfbbdd53a 100644 --- a/test/fixedbugs/issue6703h.go +++ b/test/fixedbugs/issue6703h.go @@ -17,4 +17,4 @@ func (T) m() int { type E struct{ T } -var x = E.m(E{0}) // ERROR "initialization loop|depends upon itself" +var x = E.m(E{0}) // ERROR "initialization loop|depends upon itself" diff --git a/test/fixedbugs/issue6703i.go b/test/fixedbugs/issue6703i.go index fb580a2461021..c412268d7e1aa 100644 --- a/test/fixedbugs/issue6703i.go +++ b/test/fixedbugs/issue6703i.go @@ -17,4 +17,4 @@ func (T) m() int { type E struct{ T } -var x = E{}.m // ERROR "initialization loop|depends upon itself" +var x = E{}.m // ERROR "initialization loop|depends upon itself" diff --git a/test/fixedbugs/issue6703o.go b/test/fixedbugs/issue6703o.go index a11fdfd858e7f..e87e5ecec431b 100644 --- a/test/fixedbugs/issue6703o.go +++ b/test/fixedbugs/issue6703o.go @@ -19,5 +19,5 @@ type E struct{ T } var ( e E - x = e.m // ERROR "initialization loop|depends upon itself" + x = e.m // ERROR "initialization loop|depends upon itself" ) diff --git a/test/fixedbugs/issue6703p.go b/test/fixedbugs/issue6703p.go index 3ac7a63de88fc..79c6a5f41ce97 100644 --- a/test/fixedbugs/issue6703p.go +++ b/test/fixedbugs/issue6703p.go @@ -19,5 +19,5 @@ type E struct{ T } var ( e E - x = e.m() // ERROR "initialization loop|depends upon itself" + x = e.m() // ERROR "initialization loop|depends upon itself" ) diff --git a/test/fixedbugs/issue6703q.go b/test/fixedbugs/issue6703q.go index b087c15d37b5a..743a6ae3df6bd 100644 --- a/test/fixedbugs/issue6703q.go +++ b/test/fixedbugs/issue6703q.go @@ -24,5 +24,5 @@ type E struct{ T } var ( e E - x = g().m // ERROR "initialization loop|depends upon itself" + x = g().m // ERROR "initialization loop|depends upon itself" ) diff --git a/test/fixedbugs/issue6703r.go b/test/fixedbugs/issue6703r.go index de514f1802ab3..a22f9a2122b48 100644 --- a/test/fixedbugs/issue6703r.go +++ b/test/fixedbugs/issue6703r.go @@ -24,5 +24,5 @@ type E struct{ T } var ( e E - x = g().m() // ERROR "initialization loop|depends upon itself" + x = g().m() // ERROR "initialization loop|depends upon itself" ) diff --git a/test/fixedbugs/issue6703y.go b/test/fixedbugs/issue6703y.go index 278dfcdb5e0b2..f679933f8e855 100644 --- a/test/fixedbugs/issue6703y.go +++ b/test/fixedbugs/issue6703y.go @@ -20,4 +20,4 @@ func pf() *T { return nil } -var x = pf().pm // ERROR "initialization loop|depends upon itself" +var x = pf().pm // ERROR "initialization loop|depends upon itself" diff --git a/test/fixedbugs/issue6703z.go b/test/fixedbugs/issue6703z.go index f81a3a8c341f5..658d05a2af6cd 100644 --- a/test/fixedbugs/issue6703z.go +++ b/test/fixedbugs/issue6703z.go @@ -20,4 +20,4 @@ func pf() *T { return nil } -var x = pf().pm() // ERROR "initialization loop|depends upon itself" +var x = pf().pm() // ERROR "initialization loop|depends upon itself" diff --git a/test/fixedbugs/issue6789.dir/a.go b/test/fixedbugs/issue6789.dir/a.go index 9c90e0740cda5..9e076fec7167e 100644 --- a/test/fixedbugs/issue6789.dir/a.go +++ b/test/fixedbugs/issue6789.dir/a.go @@ -5,10 +5,10 @@ package a type unexported struct { - a int - b bool + a int + b bool } type Struct struct { - unexported + unexported } diff --git a/test/fixedbugs/issue6847.go b/test/fixedbugs/issue6847.go index da300bcd017f2..58ebb636f4afb 100644 --- a/test/fixedbugs/issue6847.go +++ b/test/fixedbugs/issue6847.go @@ -56,7 +56,7 @@ func F() { case cs, ok = <-cc: case c = <-cc: } - // Interfaces. + // Interfaces. var ( c1 chan I1 c2 chan I2 diff --git a/test/fixedbugs/issue7223.go b/test/fixedbugs/issue7223.go index 0ec3476403dbe..e03d6f703d4f9 100644 --- a/test/fixedbugs/issue7223.go +++ b/test/fixedbugs/issue7223.go @@ -7,14 +7,15 @@ package main var bits1 uint = 10 + const bits2 uint = 10 func main() { _ = make([]byte, 1<> 1) - a := make([]struct{}, length) - b := make([]struct{}, length) - _ = append(a, b...) + length := int(^uint(0) >> 1) + a := make([]struct{}, length) + b := make([]struct{}, length) + _ = append(a, b...) } func main() { diff --git a/test/fixedbugs/issue7590.go b/test/fixedbugs/issue7590.go index 607a3ae606d12..e67e393dfbd64 100644 --- a/test/fixedbugs/issue7590.go +++ b/test/fixedbugs/issue7590.go @@ -13,7 +13,7 @@ type S struct { } var M = map[string]S{ - "a": { F: 1 }, + "a": {F: 1}, } var P = M["a"] diff --git a/test/fixedbugs/issue7648.dir/a.go b/test/fixedbugs/issue7648.dir/a.go index c76aaa675f62e..9139dc279f61f 100644 --- a/test/fixedbugs/issue7648.dir/a.go +++ b/test/fixedbugs/issue7648.dir/a.go @@ -6,6 +6,5 @@ package a const ( sinPi4 = 0.70710678118654752440084436210484903928483593768847 - A = complex(sinPi4, -sinPi4) + A = complex(sinPi4, -sinPi4) ) - diff --git a/test/fixedbugs/issue7760.go b/test/fixedbugs/issue7760.go index cccae48910a70..cf99ac1cc94ad 100644 --- a/test/fixedbugs/issue7760.go +++ b/test/fixedbugs/issue7760.go @@ -13,13 +13,13 @@ import "unsafe" type myPointer unsafe.Pointer const _ = unsafe.Pointer(uintptr(1)) // ERROR "is not (a )?constant" -const _ = myPointer(uintptr(1)) // ERROR "is not (a )?constant" +const _ = myPointer(uintptr(1)) // ERROR "is not (a )?constant" const _ = (*int)(unsafe.Pointer(uintptr(1))) // ERROR "is not (a )?constant" -const _ = (*int)(myPointer(uintptr(1))) // ERROR "is not (a )?constant" +const _ = (*int)(myPointer(uintptr(1))) // ERROR "is not (a )?constant" const _ = uintptr(unsafe.Pointer(uintptr(1))) // ERROR "is not (a )?constant" -const _ = uintptr(myPointer(uintptr(1))) // ERROR "is not (a )?constant" +const _ = uintptr(myPointer(uintptr(1))) // ERROR "is not (a )?constant" const _ = []byte("") // ERROR "is not (a )?constant" const _ = []rune("") // ERROR "is not (a )?constant" diff --git a/test/fixedbugs/issue8155.go b/test/fixedbugs/issue8155.go index 56a6738920672..5450d04bc8e3d 100644 --- a/test/fixedbugs/issue8155.go +++ b/test/fixedbugs/issue8155.go @@ -36,7 +36,7 @@ func poison() uintptr { var x [20]uintptr var s uintptr for i := range x { - x[i] = uintptr(i+1) + x[i] = uintptr(i + 1) s += x[i] } return s diff --git a/test/fixedbugs/issue8961.go b/test/fixedbugs/issue8961.go index 22b0f0410a92e..144bbb2cf7969 100644 --- a/test/fixedbugs/issue8961.go +++ b/test/fixedbugs/issue8961.go @@ -7,7 +7,8 @@ // Issue 8961. Empty composite literals to small globals were not filled in package main -type small struct { a int } +type small struct{ a int } + var foo small func main() { diff --git a/test/fixedbugs/issue9076.go b/test/fixedbugs/issue9076.go index 8daf12fee8be1..dd2a474148bdc 100644 --- a/test/fixedbugs/issue9076.go +++ b/test/fixedbugs/issue9076.go @@ -11,5 +11,6 @@ package main import "unsafe" const Hundred = 100 -var _ int32 = 100/unsafe.Sizeof(int(0)) + 1 // GC_ERROR "100 \/ unsafe.Sizeof\(int\(0\)\) \+ 1" + +var _ int32 = 100/unsafe.Sizeof(int(0)) + 1 // GC_ERROR "100 \/ unsafe.Sizeof\(int\(0\)\) \+ 1" var _ int32 = Hundred/unsafe.Sizeof(int(0)) + 1 // GC_ERROR "Hundred \/ unsafe.Sizeof\(int\(0\)\) \+ 1" diff --git a/test/fixedbugs/issue9083.go b/test/fixedbugs/issue9083.go index 8fbd78be7a744..ea53e7a69ae0b 100644 --- a/test/fixedbugs/issue9083.go +++ b/test/fixedbugs/issue9083.go @@ -13,10 +13,10 @@ const zero = 0 func main() { var x int - x = make(map[int]int) // ERROR "cannot use make\(map\[int\]int\)|incompatible" - x = make(map[int]int, 0) // ERROR "cannot use make\(map\[int\]int, 0\)|incompatible" + x = make(map[int]int) // ERROR "cannot use make\(map\[int\]int\)|incompatible" + x = make(map[int]int, 0) // ERROR "cannot use make\(map\[int\]int, 0\)|incompatible" x = make(map[int]int, zero) // ERROR "cannot use make\(map\[int\]int, zero\)|incompatible" - x = make(chan int) // ERROR "cannot use make\(chan int\)|incompatible" - x = make(chan int, 0) // ERROR "cannot use make\(chan int, 0\)|incompatible" - x = make(chan int, zero) // ERROR "cannot use make\(chan int, zero\)|incompatible" + x = make(chan int) // ERROR "cannot use make\(chan int\)|incompatible" + x = make(chan int, 0) // ERROR "cannot use make\(chan int, 0\)|incompatible" + x = make(chan int, zero) // ERROR "cannot use make\(chan int, zero\)|incompatible" } diff --git a/test/fixedbugs/issue9537.dir/b.go b/test/fixedbugs/issue9537.dir/b.go index 52e64c81f1f6e..c8dce22c144b8 100644 --- a/test/fixedbugs/issue9537.dir/b.go +++ b/test/fixedbugs/issue9537.dir/b.go @@ -15,8 +15,8 @@ type X struct { } type Intf interface { - Get() []byte - RetPtr(int) *int + Get() []byte + RetPtr(int) *int RetRPtr(int) (int, *int) } diff --git a/test/fixedbugs/issue9634.go b/test/fixedbugs/issue9634.go index 2d5aae4a30e6c..cc3e7484eb4e2 100644 --- a/test/fixedbugs/issue9634.go +++ b/test/fixedbugs/issue9634.go @@ -10,7 +10,7 @@ package main func main() { - s := struct{ + s := struct { t []int u int }{} diff --git a/test/for.go b/test/for.go index 8a50090657fb5..14d516bf714cc 100644 --- a/test/for.go +++ b/test/for.go @@ -44,11 +44,11 @@ func main() { for sum < 100 { sum = sum + 9 } - assertequal(sum, 99 + 9, "only one") + assertequal(sum, 99+9, "only one") sum = 0 for i := 0; i <= 10; i++ { - if i % 2 == 0 { + if i%2 == 0 { continue } sum = sum + i diff --git a/test/func.go b/test/func.go index 246cb56fd95c3..9a31b4f300d56 100644 --- a/test/func.go +++ b/test/func.go @@ -41,7 +41,6 @@ func f7(a int) (x int, y float32) { return 7, 7.0 } - func f8(a int) (x int, y float32) { return 8, 8.0 } @@ -54,14 +53,12 @@ func (t *T) m10(a int, b float32) int { return (t.x + a) * (t.y + int(b)) } - func f9(a int) (i int, f float32) { i = 9 f = 9.0 return } - func main() { f1() f2(1) diff --git a/test/func1.go b/test/func1.go index fb6f56184fac2..8ab4b70989495 100644 --- a/test/func1.go +++ b/test/func1.go @@ -13,7 +13,6 @@ func f1(a int) (int, float32) { return 7, 7.0 } - func f2(a int) (a int, b float32) { // ERROR "duplicate argument a|definition" return 8, 8.0 } diff --git a/test/func4.go b/test/func4.go index 85f1e4b81e91f..53e69cf0a9e79 100644 --- a/test/func4.go +++ b/test/func4.go @@ -12,7 +12,7 @@ package main var notmain func() func main() { - var x = &main // ERROR "address of|invalid" - main = notmain // ERROR "assign to|invalid" + var x = &main // ERROR "address of|invalid" + main = notmain // ERROR "assign to|invalid" _ = x } diff --git a/test/func5.go b/test/func5.go index 2e058be7e6e19..367b683e30f66 100644 --- a/test/func5.go +++ b/test/func5.go @@ -39,7 +39,7 @@ func fn() func(int, int) int { var fc func(int, int, chan int) func addc(x, y int, c chan int) { - c <- x+y + c <- x + y } func fnc() func(int, int, chan int) { @@ -79,7 +79,7 @@ func main() { three(<-c) go fnc()(1, 2, c) three(<-c) - go func(a, b int, c chan int) { c <- a+b }(1, 2, c) + go func(a, b int, c chan int) { c <- a + b }(1, 2, c) three(<-c) emptyresults() diff --git a/test/func6.go b/test/func6.go index 5b2f9f273ec88..9b2a10846a779 100644 --- a/test/func6.go +++ b/test/func6.go @@ -9,8 +9,10 @@ package main func main() { - if func() bool { return true }() {} // gc used to say this was a syntax error - if (func() bool { return true })() {} - if (func() bool { return true }()) {} + if func() bool { return true }() { + } // gc used to say this was a syntax error + if (func() bool { return true })() { + } + if func() bool { return true }() { + } } - diff --git a/test/funcdup.go b/test/funcdup.go index 7b05d1260664f..468f255b86c8d 100644 --- a/test/funcdup.go +++ b/test/funcdup.go @@ -8,20 +8,20 @@ package p type T interface { F1(i int) (i int) // ERROR "duplicate argument i|redefinition|previous" - F2(i, i int) // ERROR "duplicate argument i|redefinition|previous" - F3() (i, i int) // ERROR "duplicate argument i|redefinition|previous" + F2(i, i int) // ERROR "duplicate argument i|redefinition|previous" + F3() (i, i int) // ERROR "duplicate argument i|redefinition|previous" } -type T1 func(i, i int) // ERROR "duplicate argument i|redefinition|previous" +type T1 func(i, i int) // ERROR "duplicate argument i|redefinition|previous" type T2 func(i int) (i int) // ERROR "duplicate argument i|redefinition|previous" -type T3 func() (i, i int) // ERROR "duplicate argument i|redefinition|previous" +type T3 func() (i, i int) // ERROR "duplicate argument i|redefinition|previous" type R struct{} -func (i *R) F1(i int) {} // ERROR "duplicate argument i|redefinition|previous" -func (i *R) F2() (i int) {return 0} // ERROR "duplicate argument i|redefinition|previous" -func (i *R) F3(j int) (j int) {return 0} // ERROR "duplicate argument j|redefinition|previous" +func (i *R) F1(i int) {} // ERROR "duplicate argument i|redefinition|previous" +func (i *R) F2() (i int) { return 0 } // ERROR "duplicate argument i|redefinition|previous" +func (i *R) F3(j int) (j int) { return 0 } // ERROR "duplicate argument j|redefinition|previous" -func F1(i, i int) {} // ERROR "duplicate argument i|redefinition|previous" -func F2(i int) (i int) {return 0} // ERROR "duplicate argument i|redefinition|previous" -func F3() (i, i int) {return 0, 0} // ERROR "duplicate argument i|redefinition|previous" +func F1(i, i int) {} // ERROR "duplicate argument i|redefinition|previous" +func F2(i int) (i int) { return 0 } // ERROR "duplicate argument i|redefinition|previous" +func F3() (i, i int) { return 0, 0 } // ERROR "duplicate argument i|redefinition|previous" diff --git a/test/funcdup2.go b/test/funcdup2.go index 9513ef46bdd6f..fde2c9604f4b5 100644 --- a/test/funcdup2.go +++ b/test/funcdup2.go @@ -8,10 +8,10 @@ package p var T interface { F1(i int) (i int) // ERROR "duplicate argument i|redefinition|previous" - F2(i, i int) // ERROR "duplicate argument i|redefinition|previous" - F3() (i, i int) // ERROR "duplicate argument i|redefinition|previous" + F2(i, i int) // ERROR "duplicate argument i|redefinition|previous" + F3() (i, i int) // ERROR "duplicate argument i|redefinition|previous" } -var T1 func(i, i int) // ERROR "duplicate argument i|redefinition|previous" +var T1 func(i, i int) // ERROR "duplicate argument i|redefinition|previous" var T2 func(i int) (i int) // ERROR "duplicate argument i|redefinition|previous" -var T3 func() (i, i int) // ERROR "duplicate argument i|redefinition|previous" +var T3 func() (i, i int) // ERROR "duplicate argument i|redefinition|previous" diff --git a/test/gcstring.go b/test/gcstring.go index 7633d5da55e31..4b2499a60431b 100644 --- a/test/gcstring.go +++ b/test/gcstring.go @@ -25,16 +25,16 @@ func main() { setup() runtime.GC() runtime.GC() - time.Sleep(10*time.Millisecond) + time.Sleep(10 * time.Millisecond) runtime.GC() runtime.GC() - time.Sleep(10*time.Millisecond) + time.Sleep(10 * time.Millisecond) } func setup() { var Ts []interface{} buf := make([]byte, 128) - + for i := 0; i < 10000; i++ { s := string(buf) t := &T{ptr: new(*int)} @@ -42,7 +42,6 @@ func setup() { Ts = append(Ts, t) things = append(things, s[len(s):]) } - + things = append(things, Ts...) } - diff --git a/test/goprint.go b/test/goprint.go index 57eeac53a8036..84dc28e51cea2 100644 --- a/test/goprint.go +++ b/test/goprint.go @@ -16,6 +16,6 @@ import ( func main() { go println(42, true, false, true, 1.5, "world", (chan int)(nil), []int(nil), (map[string]int)(nil), (func())(nil), byte(255)) for runtime.NumGoroutine() > 1 { - time.Sleep(10*time.Millisecond) + time.Sleep(10 * time.Millisecond) } } diff --git a/test/import1.go b/test/import1.go index 2433b5f2ad2b4..19e766fd6f4e1 100644 --- a/test/import1.go +++ b/test/import1.go @@ -9,11 +9,11 @@ package main -import "bufio" // GCCGO_ERROR "previous|not used" -import bufio "os" // ERROR "redeclared|redefinition|incompatible" "imported and not used" +import "bufio" // GCCGO_ERROR "previous|not used" +import bufio "os" // ERROR "redeclared|redefinition|incompatible" "imported and not used" import ( - "fmt" // GCCGO_ERROR "previous|not used" - fmt "math" // ERROR "redeclared|redefinition|incompatible" "imported and not used: \x22math\x22 as fmt" - . "math" // GC_ERROR "imported and not used: \x22math\x22$" + "fmt" // GCCGO_ERROR "previous|not used" + . "math" // GC_ERROR "imported and not used: \x22math\x22$" + fmt "math" // ERROR "redeclared|redefinition|incompatible" "imported and not used: \x22math\x22 as fmt" ) diff --git a/test/import2.dir/import2.go b/test/import2.dir/import2.go index 9c54a1b87ea8b..aaaa7336e1097 100644 --- a/test/import2.dir/import2.go +++ b/test/import2.dir/import2.go @@ -6,37 +6,38 @@ package p -var C1 chan <- chan int = (chan<- (chan int))(nil) -var C2 chan (<- chan int) = (chan (<-chan int))(nil) -var C3 <- chan chan int = (<-chan (chan int))(nil) -var C4 chan chan <- int = (chan (chan<- int))(nil) - -var C5 <- chan <- chan int = (<-chan (<-chan int))(nil) -var C6 chan <- <- chan int = (chan<- (<-chan int))(nil) -var C7 chan <- chan <- int = (chan<- (chan<- int))(nil) - -var C8 <- chan <- chan chan int = (<-chan (<-chan (chan int)))(nil) -var C9 <- chan chan <- chan int = (<-chan (chan<- (chan int)))(nil) -var C10 chan <- <- chan chan int = (chan<- (<-chan (chan int)))(nil) -var C11 chan <- chan <- chan int = (chan<- (chan<- (chan int)))(nil) -var C12 chan chan <- <- chan int = (chan (chan<- (<-chan int)))(nil) -var C13 chan chan <- chan <- int = (chan (chan<- (chan<- int)))(nil) - -var R1 chan<- (chan int) = (chan <- chan int)(nil) -var R3 <-chan (chan int) = (<- chan chan int)(nil) -var R4 chan (chan<- int) = (chan chan <- int)(nil) - -var R5 <-chan (<-chan int) = (<- chan <- chan int)(nil) -var R6 chan<- (<-chan int) = (chan <- <- chan int)(nil) -var R7 chan<- (chan<- int) = (chan <- chan <- int)(nil) - -var R8 <-chan (<-chan (chan int)) = (<- chan <- chan chan int)(nil) -var R9 <-chan (chan<- (chan int)) = (<- chan chan <- chan int)(nil) -var R10 chan<- (<-chan (chan int)) = (chan <- <- chan chan int)(nil) -var R11 chan<- (chan<- (chan int)) = (chan <- chan <- chan int)(nil) -var R12 chan (chan<- (<-chan int)) = (chan chan <- <- chan int)(nil) -var R13 chan (chan<- (chan<- int)) = (chan chan <- chan <- int)(nil) +var C1 chan<- chan int = (chan<- (chan int))(nil) +var C2 chan (<-chan int) = (chan (<-chan int))(nil) +var C3 <-chan chan int = (<-chan (chan int))(nil) +var C4 chan chan<- int = (chan (chan<- int))(nil) + +var C5 <-chan <-chan int = (<-chan (<-chan int))(nil) +var C6 chan<- <-chan int = (chan<- (<-chan int))(nil) +var C7 chan<- chan<- int = (chan<- (chan<- int))(nil) + +var C8 <-chan <-chan chan int = (<-chan (<-chan (chan int)))(nil) +var C9 <-chan chan<- chan int = (<-chan (chan<- (chan int)))(nil) +var C10 chan<- <-chan chan int = (chan<- (<-chan (chan int)))(nil) +var C11 chan<- chan<- chan int = (chan<- (chan<- (chan int)))(nil) +var C12 chan chan<- <-chan int = (chan (chan<- (<-chan int)))(nil) +var C13 chan chan<- chan<- int = (chan (chan<- (chan<- int)))(nil) + +var R1 chan<- (chan int) = (chan<- chan int)(nil) +var R3 <-chan (chan int) = (<-chan chan int)(nil) +var R4 chan (chan<- int) = (chan chan<- int)(nil) + +var R5 <-chan (<-chan int) = (<-chan <-chan int)(nil) +var R6 chan<- (<-chan int) = (chan<- <-chan int)(nil) +var R7 chan<- (chan<- int) = (chan<- chan<- int)(nil) + +var R8 <-chan (<-chan (chan int)) = (<-chan <-chan chan int)(nil) +var R9 <-chan (chan<- (chan int)) = (<-chan chan<- chan int)(nil) +var R10 chan<- (<-chan (chan int)) = (chan<- <-chan chan int)(nil) +var R11 chan<- (chan<- (chan int)) = (chan<- chan<- chan int)(nil) +var R12 chan (chan<- (<-chan int)) = (chan chan<- <-chan int)(nil) +var R13 chan (chan<- (chan<- int)) = (chan chan<- chan<- int)(nil) var F1 func() func() int + func F2() func() func() int func F3(func() func() int) diff --git a/test/import2.dir/import3.go b/test/import2.dir/import3.go index 3bf9cb0c3ca35..461251d48926c 100644 --- a/test/import2.dir/import3.go +++ b/test/import2.dir/import3.go @@ -33,20 +33,19 @@ func main() { p.C12 = (chan (chan<- (<-chan int)))(nil) p.C13 = (chan (chan<- (chan<- int)))(nil) - p.R1 = (chan <- chan int)(nil) - p.R3 = (<- chan chan int)(nil) - p.R4 = (chan chan <- int)(nil) + p.R1 = (chan<- chan int)(nil) + p.R3 = (<-chan chan int)(nil) + p.R4 = (chan chan<- int)(nil) - p.R5 = (<- chan <- chan int)(nil) - p.R6 = (chan <- <- chan int)(nil) - p.R7 = (chan <- chan <- int)(nil) + p.R5 = (<-chan <-chan int)(nil) + p.R6 = (chan<- <-chan int)(nil) + p.R7 = (chan<- chan<- int)(nil) - p.R8 = (<- chan <- chan chan int)(nil) - p.R9 = (<- chan chan <- chan int)(nil) - p.R10 = (chan <- <- chan chan int)(nil) - p.R11 = (chan <- chan <- chan int)(nil) - p.R12 = (chan chan <- <- chan int)(nil) - p.R13 = (chan chan <- chan <- int)(nil) + p.R8 = (<-chan <-chan chan int)(nil) + p.R9 = (<-chan chan<- chan int)(nil) + p.R10 = (chan<- <-chan chan int)(nil) + p.R11 = (chan<- chan<- chan int)(nil) + p.R12 = (chan chan<- <-chan int)(nil) + p.R13 = (chan chan<- chan<- int)(nil) } - diff --git a/test/import4.dir/empty.go b/test/import4.dir/empty.go index 1dffa170dfcb6..398c260d0f94a 100644 --- a/test/import4.dir/empty.go +++ b/test/import4.dir/empty.go @@ -4,7 +4,10 @@ package empty -import ( ) -const ( ) -var ( ) -type ( ) +import () + +const () + +var () + +type () diff --git a/test/import4.dir/import4.go b/test/import4.dir/import4.go index b9f973f1724be..f174b70be4e1d 100644 --- a/test/import4.dir/import4.go +++ b/test/import4.dir/import4.go @@ -9,16 +9,15 @@ package main // standard -import "fmt" // ERROR "imported and not used.*fmt" +import "fmt" // ERROR "imported and not used.*fmt" // renamed -import X "math" // ERROR "imported and not used.*math" +import X "math" // ERROR "imported and not used.*math" // import dot -import . "bufio" // ERROR "imported and not used.*bufio" +import . "bufio" // ERROR "imported and not used.*bufio" // again, package without anything in it -import "./empty" // ERROR "imported and not used.*empty" -import Z "./empty" // ERROR "imported and not used.*empty" -import . "./empty" // ERROR "imported and not used.*empty" - +import "./empty" // ERROR "imported and not used.*empty" +import Z "./empty" // ERROR "imported and not used.*empty" +import . "./empty" // ERROR "imported and not used.*empty" diff --git a/test/indirect1.go b/test/indirect1.go index 51da4cc7c4586..1395eacaf8409 100644 --- a/test/indirect1.go +++ b/test/indirect1.go @@ -37,36 +37,36 @@ func f() { // line number for each len call when // it decides there are type errors. x := - len(m0)+ - len(m1)+ // ERROR "illegal|invalid|must be" - len(m2)+ // ERROR "illegal|invalid|must be" - len(m3)+ - len(m4)+ // ERROR "illegal|invalid|must be" + len(m0) + + len(m1) + // ERROR "illegal|invalid|must be" + len(m2) + // ERROR "illegal|invalid|must be" + len(m3) + + len(m4) + // ERROR "illegal|invalid|must be" - len(s0)+ - len(s1)+ // ERROR "illegal|invalid|must be" - len(s2)+ // ERROR "illegal|invalid|must be" - len(s3)+ - len(s4)+ // ERROR "illegal|invalid|must be" + len(s0) + + len(s1) + // ERROR "illegal|invalid|must be" + len(s2) + // ERROR "illegal|invalid|must be" + len(s3) + + len(s4) + // ERROR "illegal|invalid|must be" - len(a0)+ - len(a1)+ - len(a2)+ + len(a0) + + len(a1) + + len(a2) + - cap(a0)+ - cap(a1)+ - cap(a2)+ + cap(a0) + + cap(a1) + + cap(a2) + - len(b0)+ - len(b1)+ // ERROR "illegal|invalid|must be" - len(b2)+ // ERROR "illegal|invalid|must be" - len(b3)+ - len(b4)+ // ERROR "illegal|invalid|must be" + len(b0) + + len(b1) + // ERROR "illegal|invalid|must be" + len(b2) + // ERROR "illegal|invalid|must be" + len(b3) + + len(b4) + // ERROR "illegal|invalid|must be" - cap(b0)+ - cap(b1)+ // ERROR "illegal|invalid|must be" - cap(b2)+ // ERROR "illegal|invalid|must be" - cap(b3)+ - cap(b4) // ERROR "illegal|invalid|must be" + cap(b0) + + cap(b1) + // ERROR "illegal|invalid|must be" + cap(b2) + // ERROR "illegal|invalid|must be" + cap(b3) + + cap(b4) // ERROR "illegal|invalid|must be" _ = x } diff --git a/test/initcomma.go b/test/initcomma.go index a54fce4280236..e6cfffda3a0ec 100644 --- a/test/initcomma.go +++ b/test/initcomma.go @@ -8,10 +8,10 @@ package main -var a = []int{1, 2, } -var b = [5]int{1, 2, 3, } -var c = []int{1, } -var d = [...]int{1, 2, 3, } +var a = []int{1, 2} +var b = [5]int{1, 2, 3} +var c = []int{1} +var d = [...]int{1, 2, 3} func main() { if len(a) != 2 { diff --git a/test/initialize.go b/test/initialize.go index 1307e0209615b..0cf7fe2f5cae8 100644 --- a/test/initialize.go +++ b/test/initialize.go @@ -19,35 +19,35 @@ type T struct { S } -var a1 = S { 0, 0, 0, 1, 2, 3 } -var b1 = S { X: 1, Z: 3, Y: 2 } +var a1 = S{0, 0, 0, 1, 2, 3} +var b1 = S{X: 1, Z: 3, Y: 2} -var a2 = S { 0, 0, 0, 0, 0, 0, } -var b2 = S { } +var a2 = S{0, 0, 0, 0, 0, 0} +var b2 = S{} -var a3 = T { S { 1, 2, 3, 0, 0, 0, } } -var b3 = T { S: S{ A: 1, B: 2, C: 3 } } +var a3 = T{S{1, 2, 3, 0, 0, 0}} +var b3 = T{S: S{A: 1, B: 2, C: 3}} -var a4 = &[16]byte { 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, } -var b4 = &[16]byte { 4: 1, 1, 1, 1, 12: 1, 1, } +var a4 = &[16]byte{0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0} +var b4 = &[16]byte{4: 1, 1, 1, 1, 12: 1, 1} -var a5 = &[16]byte { 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, } -var b5 = &[16]byte { 1, 4: 1, 1, 1, 1, 12: 1, 1, } +var a5 = &[16]byte{1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0} +var b5 = &[16]byte{1, 4: 1, 1, 1, 1, 12: 1, 1} -var a6 = &[16]byte { 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, } -var b6 = &[...]byte { 1, 4: 1, 1, 1, 1, 12: 1, 1, 0, 0,} +var a6 = &[16]byte{1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0} +var b6 = &[...]byte{1, 4: 1, 1, 1, 1, 12: 1, 1, 0, 0} type Same struct { a, b interface{} } -var same = []Same { - Same{ a1, b1 }, - Same{ a2, b2 }, - Same{ a3, b3 }, - Same{ a4, b4 }, - Same{ a5, b5 }, - Same{ a6, b6 }, +var same = []Same{ + Same{a1, b1}, + Same{a2, b2}, + Same{a3, b3}, + Same{a4, b4}, + Same{a5, b5}, + Same{a6, b6}, } func main() { diff --git a/test/initializerr.go b/test/initializerr.go index 990ab60f96b00..11f1941629209 100644 --- a/test/initializerr.go +++ b/test/initializerr.go @@ -18,24 +18,24 @@ type T struct { } var x = 1 -var a1 = S { 0, X: 1 } // ERROR "mixture|undefined" -var a2 = S { Y: 3, Z: 2, Y: 3 } // ERROR "duplicate" -var a3 = T { S{}, 2, 3, 4, 5, 6 } // ERROR "convert|too many" -var a4 = [5]byte{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 } // ERROR "index|too many" -var a5 = []byte { x: 2 } // ERROR "index" -var a6 = []byte{1: 1, 2: 2, 1: 3} // ERROR "duplicate index" +var a1 = S{0, X: 1} // ERROR "mixture|undefined" +var a2 = S{Y: 3, Z: 2, Y: 3} // ERROR "duplicate" +var a3 = T{S{}, 2, 3, 4, 5, 6} // ERROR "convert|too many" +var a4 = [5]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10} // ERROR "index|too many" +var a5 = []byte{x: 2} // ERROR "index" +var a6 = []byte{1: 1, 2: 2, 1: 3} // ERROR "duplicate index" -var ok1 = S { } // should be ok -var ok2 = T { S: ok1 } // should be ok +var ok1 = S{} // should be ok +var ok2 = T{S: ok1} // should be ok // These keys can be computed at compile time but they are // not constants as defined by the spec, so they do not trigger // compile-time errors about duplicate key values. // See issue 4555. -type Key struct {X, Y int} +type Key struct{ X, Y int } var _ = map[Key]string{ - Key{1,2}: "hello", - Key{1,2}: "world", + Key{1, 2}: "hello", + Key{1, 2}: "world", } diff --git a/test/int_lit.go b/test/int_lit.go index 78deaea130205..a448e58f19928 100644 --- a/test/int_lit.go +++ b/test/int_lit.go @@ -11,7 +11,7 @@ package main import "os" func main() { - s := 0 + + s := 0 + 123 + 0123 + 0000 + diff --git a/test/intcvt.go b/test/intcvt.go index 3920528a403bf..d9477617ae81a 100644 --- a/test/intcvt.go +++ b/test/intcvt.go @@ -86,6 +86,7 @@ func chku64(i, v uint64) { panic("fail") } } + //func chkf32(f, v float32) { if f != v { println(f, "!=", v); panic("fail") } } //func chkf64(f, v float64) { if f != v { println(f, "!=", v); panic("fail") } } @@ -134,7 +135,6 @@ func main() { // chki64(int64(f32), 0) // chki64(int64(f64), 0) - chku8(uint8(i8), ci8&0xff) chku8(uint8(i16), ci16&0xff) chku8(uint8(i32), ci32&0xff) diff --git a/test/interface/bigdata.go b/test/interface/bigdata.go index 0f2e9a990ec9d..f194f75b0881b 100644 --- a/test/interface/bigdata.go +++ b/test/interface/bigdata.go @@ -8,15 +8,18 @@ package main -type I interface { M() int64 } +type I interface{ M() int64 } -type BigPtr struct { a, b, c, d int64 } -func (z *BigPtr) M() int64 { return z.a+z.b+z.c+z.d } +type BigPtr struct{ a, b, c, d int64 } + +func (z *BigPtr) M() int64 { return z.a + z.b + z.c + z.d } + +type SmallPtr struct{ a int32 } -type SmallPtr struct { a int32 } func (z *SmallPtr) M() int64 { return int64(z.a) } type IntPtr int32 + func (z *IntPtr) M() int64 { return int64(*z) } var bad bool @@ -30,30 +33,33 @@ func test(name string, i I) { } func ptrs() { - var bigptr BigPtr = BigPtr{ 10000, 2000, 300, 45 } - var smallptr SmallPtr = SmallPtr{ 12345 } + var bigptr BigPtr = BigPtr{10000, 2000, 300, 45} + var smallptr SmallPtr = SmallPtr{12345} var intptr IntPtr = 12345 -// test("bigptr", bigptr) + // test("bigptr", bigptr) test("&bigptr", &bigptr) -// test("smallptr", smallptr) + // test("smallptr", smallptr) test("&smallptr", &smallptr) -// test("intptr", intptr) + // test("intptr", intptr) test("&intptr", &intptr) } -type Big struct { a, b, c, d int64 } -func (z Big) M() int64 { return z.a+z.b+z.c+z.d } +type Big struct{ a, b, c, d int64 } + +func (z Big) M() int64 { return z.a + z.b + z.c + z.d } + +type Small struct{ a int32 } -type Small struct { a int32 } func (z Small) M() int64 { return int64(z.a) } type Int int32 + func (z Int) M() int64 { return int64(z) } func nonptrs() { - var big Big = Big{ 10000, 2000, 300, 45 } - var small Small = Small{ 12345 } + var big Big = Big{10000, 2000, 300, 45} + var small Small = Small{12345} var int Int = 12345 test("big", big) diff --git a/test/interface/convert1.go b/test/interface/convert1.go index 4a3ec8a375da2..98261edf9b68c 100644 --- a/test/interface/convert1.go +++ b/test/interface/convert1.go @@ -8,10 +8,13 @@ package main -type R interface { R() } -type RW interface { R(); W() } +type R interface{ R() } +type RW interface { + R() + W() +} -var e interface {} +var e interface{} var r R var rw RW diff --git a/test/interface/convert2.go b/test/interface/convert2.go index 4a3ec8a375da2..98261edf9b68c 100644 --- a/test/interface/convert2.go +++ b/test/interface/convert2.go @@ -8,10 +8,13 @@ package main -type R interface { R() } -type RW interface { R(); W() } +type R interface{ R() } +type RW interface { + R() + W() +} -var e interface {} +var e interface{} var r R var rw RW diff --git a/test/interface/embed.go b/test/interface/embed.go index 5c52ac0232346..993c532b2a092 100644 --- a/test/interface/embed.go +++ b/test/interface/embed.go @@ -12,16 +12,19 @@ import "os" const Value = 1e12 -type Inter interface { M() int64 } +type Inter interface{ M() int64 } type T int64 + func (t T) M() int64 { return int64(t) } + var t = T(Value) var pt = &t var ti Inter = t -type S struct { Inter } -var s = S{ ti } +type S struct{ Inter } + +var s = S{ti} var ps = &s var i Inter diff --git a/test/interface/embed1.dir/embed0.go b/test/interface/embed1.dir/embed0.go index 728bec74e876c..4aed391b634a0 100644 --- a/test/interface/embed1.dir/embed0.go +++ b/test/interface/embed1.dir/embed0.go @@ -7,10 +7,11 @@ package p type T int + func (t T) m() {} -type I interface { m() } -type J interface { I } +type I interface{ m() } +type J interface{ I } func main() { var i I diff --git a/test/interface/embed1.dir/embed1.go b/test/interface/embed1.dir/embed1.go index 7dfb1dbc0ad41..54754f30697a6 100644 --- a/test/interface/embed1.dir/embed1.go +++ b/test/interface/embed1.dir/embed1.go @@ -9,13 +9,14 @@ package main import "./embed0" type T int + func (t T) m() {} -type I interface { m() } -type J interface { I } +type I interface{ m() } +type J interface{ I } -type PI interface { p.I } -type PJ interface { p.J } +type PI interface{ p.I } +type PJ interface{ p.J } func main() { var i I diff --git a/test/interface/pointer.go b/test/interface/pointer.go index 2927050669a9f..23e8ec285c51c 100644 --- a/test/interface/pointer.go +++ b/test/interface/pointer.go @@ -24,7 +24,6 @@ type Start struct { func (start *Start) Next() *Inst { return nil } - func AddInst(Inst) *Inst { print("ok in addinst\n") return nil @@ -34,5 +33,5 @@ func main() { print("call addinst\n") var x Inst = AddInst(new(Start)) // ERROR "pointer to interface" print("return from addinst\n") - var y *Inst = new(Start) // ERROR "pointer to interface|incompatible type" + var y *Inst = new(Start) // ERROR "pointer to interface|incompatible type" } diff --git a/test/interface/private.dir/private1.go b/test/interface/private.dir/private1.go index 75eee51f5a050..8743ddb352e0b 100644 --- a/test/interface/private.dir/private1.go +++ b/test/interface/private.dir/private1.go @@ -15,4 +15,3 @@ type Implementation struct{} func (p *Implementation) private() {} var X = new(Implementation) - diff --git a/test/interface/private.dir/prog.go b/test/interface/private.dir/prog.go index abea7d625c762..e20c188edad35 100644 --- a/test/interface/private.dir/prog.go +++ b/test/interface/private.dir/prog.go @@ -25,9 +25,9 @@ func main() { var px p.Exported px = p.X - px.private() // ERROR "private" + px.private() // ERROR "private" - px = new(Implementation) // ERROR "private" + px = new(Implementation) // ERROR "private" - x = px // ERROR "private" + x = px // ERROR "private" } diff --git a/test/interface/recursive.go b/test/interface/recursive.go index fcc88331e0b3e..bfb517bdcc4b0 100644 --- a/test/interface/recursive.go +++ b/test/interface/recursive.go @@ -17,5 +17,6 @@ type I2 interface { } type T int + func (t T) foo() I2 { return t } func (t T) bar() I1 { return t } diff --git a/test/interface/returntype.go b/test/interface/returntype.go index 4d86f39184090..d94b2ed68bdbf 100644 --- a/test/interface/returntype.go +++ b/test/interface/returntype.go @@ -8,14 +8,14 @@ package main -type S struct { a int } -type T struct { b string } +type S struct{ a int } +type T struct{ b string } -func (s *S) Name() int8 { return 1 } +func (s *S) Name() int8 { return 1 } func (t *T) Name() int64 { return 64 } -type I1 interface { Name() int8 } -type I2 interface { Name() int64 } +type I1 interface{ Name() int8 } +type I2 interface{ Name() int64 } func main() { shouldPanic(p1) diff --git a/test/interface/struct.go b/test/interface/struct.go index f60819ca8116f..628e5de5e3bce 100644 --- a/test/interface/struct.go +++ b/test/interface/struct.go @@ -13,16 +13,20 @@ import "os" var fail int func check(b bool, msg string) { - if (!b) { + if !b { println("failure in", msg) fail++ } } -type I1 interface { Get() int; Put(int) } +type I1 interface { + Get() int + Put(int) +} + +type S1 struct{ i int } -type S1 struct { i int } -func (p S1) Get() int { return p.i } +func (p S1) Get() int { return p.i } func (p S1) Put(i int) { p.i = i } func f1() { @@ -49,8 +53,9 @@ func f3() { check(s.i == 1, "f3 s") } -type S2 struct { i int } -func (p *S2) Get() int { return p.i } +type S2 struct{ i int } + +func (p *S2) Get() int { return p.i } func (p *S2) Put(i int) { p.i = i } // Disallowed by restriction of values going to pointer receivers @@ -78,10 +83,14 @@ func f6() { check(s.i == 2, "f6 s") } -type I2 interface { Get() int64; Put(int64) } +type I2 interface { + Get() int64 + Put(int64) +} + +type S3 struct{ i, j, k, l int64 } -type S3 struct { i, j, k, l int64 } -func (p S3) Get() int64 { return p.l } +func (p S3) Get() int64 { return p.l } func (p S3) Put(i int64) { p.l = i } func f7() { @@ -108,8 +117,9 @@ func f9() { check(s.l == 4, "f9 s") } -type S4 struct { i, j, k, l int64 } -func (p *S4) Get() int64 { return p.l } +type S4 struct{ i, j, k, l int64 } + +func (p *S4) Get() int64 { return p.l } func (p *S4) Put(i int64) { p.l = i } // Disallowed by restriction of values going to pointer receivers @@ -141,13 +151,13 @@ func main() { f1() f2() f3() -// f4() + // f4() f5() f6() f7() f8() f9() -// f10() + // f10() f11() f12() if fail > 0 { diff --git a/test/iota.go b/test/iota.go index 7187dbe335ea4..490b27d23883e 100644 --- a/test/iota.go +++ b/test/iota.go @@ -16,9 +16,9 @@ func assert(cond bool, msg string) { } const ( - x int = iota - y = iota - z = 1 << iota + x int = iota + y = iota + z = 1 << iota f float32 = 2 * iota g float32 = 4.5 * float32(iota) ) diff --git a/test/ken/complit.go b/test/ken/complit.go index bc50bbe224c35..99d9d7713fa1c 100644 --- a/test/ken/complit.go +++ b/test/ken/complit.go @@ -8,118 +8,115 @@ package main -type M map[int]int -type S struct{ a,b,c int }; -type SS struct{ aa,bb,cc S }; -type SA struct{ a,b,c [3]int }; -type SC struct{ a,b,c []int }; -type SM struct{ a,b,c M }; - -func -main() { - test("s.a", s.a); - test("s.b", s.b); - test("s.c", s.c); - - test("ss.aa.a", ss.aa.a); - test("ss.aa.b", ss.aa.b); - test("ss.aa.c", ss.aa.c); - - test("ss.bb.a", ss.bb.a); - test("ss.bb.b", ss.bb.b); - test("ss.bb.c", ss.bb.c); - - test("ss.cc.a", ss.cc.a); - test("ss.cc.b", ss.cc.b); - test("ss.cc.c", ss.cc.c); - - for i:=0; i<3; i++ { - test("a[i]", a[i]); - test("c[i]", c[i]); - test("m[i]", m[i]); - - test("as[i].a", as[i].a); - test("as[i].b", as[i].b); - test("as[i].c", as[i].c); - - test("cs[i].a", cs[i].a); - test("cs[i].b", cs[i].b); - test("cs[i].c", cs[i].c); - - test("ms[i].a", ms[i].a); - test("ms[i].b", ms[i].b); - test("ms[i].c", ms[i].c); - - test("sa.a[i]", sa.a[i]); - test("sa.b[i]", sa.b[i]); - test("sa.c[i]", sa.c[i]); - - test("sc.a[i]", sc.a[i]); - test("sc.b[i]", sc.b[i]); - test("sc.c[i]", sc.c[i]); - - test("sm.a[i]", sm.a[i]); - test("sm.b[i]", sm.b[i]); - test("sm.c[i]", sm.c[i]); - - for j:=0; j<3; j++ { - test("aa[i][j]", aa[i][j]); - test("ac[i][j]", ac[i][j]); - test("am[i][j]", am[i][j]); - test("ca[i][j]", ca[i][j]); - test("cc[i][j]", cc[i][j]); - test("cm[i][j]", cm[i][j]); - test("ma[i][j]", ma[i][j]); - test("mc[i][j]", mc[i][j]); - test("mm[i][j]", mm[i][j]); +type M map[int]int +type S struct{ a, b, c int } +type SS struct{ aa, bb, cc S } +type SA struct{ a, b, c [3]int } +type SC struct{ a, b, c []int } +type SM struct{ a, b, c M } + +func main() { + test("s.a", s.a) + test("s.b", s.b) + test("s.c", s.c) + + test("ss.aa.a", ss.aa.a) + test("ss.aa.b", ss.aa.b) + test("ss.aa.c", ss.aa.c) + + test("ss.bb.a", ss.bb.a) + test("ss.bb.b", ss.bb.b) + test("ss.bb.c", ss.bb.c) + + test("ss.cc.a", ss.cc.a) + test("ss.cc.b", ss.cc.b) + test("ss.cc.c", ss.cc.c) + + for i := 0; i < 3; i++ { + test("a[i]", a[i]) + test("c[i]", c[i]) + test("m[i]", m[i]) + + test("as[i].a", as[i].a) + test("as[i].b", as[i].b) + test("as[i].c", as[i].c) + + test("cs[i].a", cs[i].a) + test("cs[i].b", cs[i].b) + test("cs[i].c", cs[i].c) + + test("ms[i].a", ms[i].a) + test("ms[i].b", ms[i].b) + test("ms[i].c", ms[i].c) + + test("sa.a[i]", sa.a[i]) + test("sa.b[i]", sa.b[i]) + test("sa.c[i]", sa.c[i]) + + test("sc.a[i]", sc.a[i]) + test("sc.b[i]", sc.b[i]) + test("sc.c[i]", sc.c[i]) + + test("sm.a[i]", sm.a[i]) + test("sm.b[i]", sm.b[i]) + test("sm.c[i]", sm.c[i]) + + for j := 0; j < 3; j++ { + test("aa[i][j]", aa[i][j]) + test("ac[i][j]", ac[i][j]) + test("am[i][j]", am[i][j]) + test("ca[i][j]", ca[i][j]) + test("cc[i][j]", cc[i][j]) + test("cm[i][j]", cm[i][j]) + test("ma[i][j]", ma[i][j]) + test("mc[i][j]", mc[i][j]) + test("mm[i][j]", mm[i][j]) } } } -var ref = 0; +var ref = 0 -func -test(xs string, x int) { +func test(xs string, x int) { if ref >= len(answers) { - println(xs, x); - return; + println(xs, x) + return } if x != answers[ref] { println(xs, "is", x, "should be", answers[ref]) } - ref++; + ref++ } +var a = [3]int{1001, 1002, 1003} +var s = S{1101, 1102, 1103} +var c = []int{1201, 1202, 1203} +var m = M{0: 1301, 1: 1302, 2: 1303} -var a = [3]int{1001, 1002, 1003} -var s = S{1101, 1102, 1103} -var c = []int{1201, 1202, 1203} -var m = M{0:1301, 1:1302, 2:1303} +var aa = [3][3]int{[3]int{2001, 2002, 2003}, [3]int{2004, 2005, 2006}, [3]int{2007, 2008, 2009}} +var as = [3]S{S{2101, 2102, 2103}, S{2104, 2105, 2106}, S{2107, 2108, 2109}} +var ac = [3][]int{[]int{2201, 2202, 2203}, []int{2204, 2205, 2206}, []int{2207, 2208, 2209}} +var am = [3]M{M{0: 2301, 1: 2302, 2: 2303}, M{0: 2304, 1: 2305, 2: 2306}, M{0: 2307, 1: 2308, 2: 2309}} -var aa = [3][3]int{[3]int{2001,2002,2003}, [3]int{2004,2005,2006}, [3]int{2007,2008,2009}} -var as = [3]S{S{2101,2102,2103},S{2104,2105,2106},S{2107,2108,2109}} -var ac = [3][]int{[]int{2201,2202,2203}, []int{2204,2205,2206}, []int{2207,2208,2209}} -var am = [3]M{M{0:2301,1:2302,2:2303}, M{0:2304,1:2305,2:2306}, M{0:2307,1:2308,2:2309}} +var sa = SA{[3]int{3001, 3002, 3003}, [3]int{3004, 3005, 3006}, [3]int{3007, 3008, 3009}} +var ss = SS{S{3101, 3102, 3103}, S{3104, 3105, 3106}, S{3107, 3108, 3109}} +var sc = SC{[]int{3201, 3202, 3203}, []int{3204, 3205, 3206}, []int{3207, 3208, 3209}} +var sm = SM{M{0: 3301, 1: 3302, 2: 3303}, M{0: 3304, 1: 3305, 2: 3306}, M{0: 3307, 1: 3308, 2: 3309}} -var sa = SA{[3]int{3001,3002,3003},[3]int{3004,3005,3006},[3]int{3007,3008,3009}} -var ss = SS{S{3101,3102,3103},S{3104,3105,3106},S{3107,3108,3109}} -var sc = SC{[]int{3201,3202,3203},[]int{3204,3205,3206},[]int{3207,3208,3209}} -var sm = SM{M{0:3301,1:3302,2:3303}, M{0:3304,1:3305,2:3306}, M{0:3307,1:3308,2:3309}} +var ca = [][3]int{[3]int{4001, 4002, 4003}, [3]int{4004, 4005, 4006}, [3]int{4007, 4008, 4009}} +var cs = []S{S{4101, 4102, 4103}, S{4104, 4105, 4106}, S{4107, 4108, 4109}} +var cc = [][]int{[]int{4201, 4202, 4203}, []int{4204, 4205, 4206}, []int{4207, 4208, 4209}} +var cm = []M{M{0: 4301, 1: 4302, 2: 4303}, M{0: 4304, 1: 4305, 2: 4306}, M{0: 4307, 1: 4308, 2: 4309}} -var ca = [][3]int{[3]int{4001,4002,4003}, [3]int{4004,4005,4006}, [3]int{4007,4008,4009}} -var cs = []S{S{4101,4102,4103},S{4104,4105,4106},S{4107,4108,4109}} -var cc = [][]int{[]int{4201,4202,4203}, []int{4204,4205,4206}, []int{4207,4208,4209}} -var cm = []M{M{0:4301,1:4302,2:4303}, M{0:4304,1:4305,2:4306}, M{0:4307,1:4308,2:4309}} +var ma = map[int][3]int{0: [3]int{5001, 5002, 5003}, 1: [3]int{5004, 5005, 5006}, 2: [3]int{5007, 5008, 5009}} +var ms = map[int]S{0: S{5101, 5102, 5103}, 1: S{5104, 5105, 5106}, 2: S{5107, 5108, 5109}} +var mc = map[int][]int{0: []int{5201, 5202, 5203}, 1: []int{5204, 5205, 5206}, 2: []int{5207, 5208, 5209}} +var mm = map[int]M{0: M{0: 5301, 1: 5302, 2: 5303}, 1: M{0: 5304, 1: 5305, 2: 5306}, 2: M{0: 5307, 1: 5308, 2: 5309}} -var ma = map[int][3]int{0:[3]int{5001,5002,5003}, 1:[3]int{5004,5005,5006}, 2:[3]int{5007,5008,5009}} -var ms = map[int]S{0:S{5101,5102,5103},1:S{5104,5105,5106},2:S{5107,5108,5109}} -var mc = map[int][]int{0:[]int{5201,5202,5203}, 1:[]int{5204,5205,5206}, 2:[]int{5207,5208,5209}} -var mm = map[int]M{0:M{0:5301,1:5302,2:5303}, 1:M{0:5304,1:5305,2:5306}, 2:M{0:5307,1:5308,2:5309}} - -var answers = [...]int { +var answers = [...]int{ // s 1101, 1102, 1103, diff --git a/test/ken/convert.go b/test/ken/convert.go index 33acbd8cd2184..f3b08edbc2344 100644 --- a/test/ken/convert.go +++ b/test/ken/convert.go @@ -9,26 +9,26 @@ package main -var i8 int8; -var u8 uint8; -var i16 int16; -var u16 uint16; -var i32 int32; -var u32 uint32; -var i64 int64; -var u64 uint64; -var f32 float32; -var f64 float64; - -type big float64 - -type t struct { - from, to int - val big +var i8 int8 +var u8 uint8 +var i16 int16 +var u16 uint16 +var i32 int32 +var u32 uint32 +var i64 int64 +var u64 uint64 +var f32 float32 +var f64 float64 + +type big float64 + +type t struct { + from, to int + val big } const ( - ti8 = iota+1 + ti8 = iota + 1 tu8 ti16 tu16 @@ -40,177 +40,184 @@ const ( tf64 ) -var x = []t{ +var x = []t{ /* value good in all types (10) */ - { ti8, ti8, 10 }, { ti8, tu8, 10 }, { ti8, ti16, 10 }, { ti8, tu16, 10 }, - { ti8, ti32, 10 }, { ti8, tu32, 10 }, { ti8, ti64, 10 }, { ti8, tu64, 10 }, - { ti8, tf32, 10 }, { ti8, tf64, 10 }, + {ti8, ti8, 10}, {ti8, tu8, 10}, {ti8, ti16, 10}, {ti8, tu16, 10}, + {ti8, ti32, 10}, {ti8, tu32, 10}, {ti8, ti64, 10}, {ti8, tu64, 10}, + {ti8, tf32, 10}, {ti8, tf64, 10}, - { tu8, ti8, 10 }, { tu8, tu8, 10 }, { tu8, ti16, 10 }, { tu8, tu16, 10 }, - { tu8, ti32, 10 }, { tu8, tu32, 10 }, { tu8, ti64, 10 }, { tu8, tu64, 10 }, - { tu8, tf32, 10 }, { tu8, tf64, 10 }, + {tu8, ti8, 10}, {tu8, tu8, 10}, {tu8, ti16, 10}, {tu8, tu16, 10}, + {tu8, ti32, 10}, {tu8, tu32, 10}, {tu8, ti64, 10}, {tu8, tu64, 10}, + {tu8, tf32, 10}, {tu8, tf64, 10}, - { ti16, ti8, 10 }, { ti16, tu8, 10 }, { ti16, ti16, 10 }, { ti16, tu16, 10 }, - { ti16, ti32, 10 }, { ti16, tu32, 10 }, { ti16, ti64, 10 }, { ti16, tu64, 10 }, - { ti16, tf32, 10 }, { ti16, tf64, 10 }, + {ti16, ti8, 10}, {ti16, tu8, 10}, {ti16, ti16, 10}, {ti16, tu16, 10}, + {ti16, ti32, 10}, {ti16, tu32, 10}, {ti16, ti64, 10}, {ti16, tu64, 10}, + {ti16, tf32, 10}, {ti16, tf64, 10}, - { tu16, ti8, 10 }, { tu16, tu8, 10 }, { tu16, ti16, 10 }, { tu16, tu16, 10 }, - { tu16, ti32, 10 }, { tu16, tu32, 10 }, { tu16, ti64, 10 }, { tu16, tu64, 10 }, - { tu16, tf32, 10 }, { tu16, tf64, 10 }, + {tu16, ti8, 10}, {tu16, tu8, 10}, {tu16, ti16, 10}, {tu16, tu16, 10}, + {tu16, ti32, 10}, {tu16, tu32, 10}, {tu16, ti64, 10}, {tu16, tu64, 10}, + {tu16, tf32, 10}, {tu16, tf64, 10}, - { ti32, ti8, 10 }, { ti32, tu8, 10 }, { ti32, ti16, 10 }, { ti32, tu16, 10 }, - { ti32, ti32, 10 }, { ti32, tu32, 10 }, { ti32, ti64, 10 }, { ti32, tu64, 10 }, - { ti32, tf32, 10 }, { ti32, tf64, 10 }, + {ti32, ti8, 10}, {ti32, tu8, 10}, {ti32, ti16, 10}, {ti32, tu16, 10}, + {ti32, ti32, 10}, {ti32, tu32, 10}, {ti32, ti64, 10}, {ti32, tu64, 10}, + {ti32, tf32, 10}, {ti32, tf64, 10}, - { tu32, ti8, 10 }, { tu32, tu8, 10 }, { tu32, ti16, 10 }, { tu32, tu16, 10 }, - { tu32, ti32, 10 }, { tu32, tu32, 10 }, { tu32, ti64, 10 }, { tu32, tu64, 10 }, - { tu32, tf32, 10 }, { tu32, tf64, 10 }, + {tu32, ti8, 10}, {tu32, tu8, 10}, {tu32, ti16, 10}, {tu32, tu16, 10}, + {tu32, ti32, 10}, {tu32, tu32, 10}, {tu32, ti64, 10}, {tu32, tu64, 10}, + {tu32, tf32, 10}, {tu32, tf64, 10}, - { ti64, ti8, 10 }, { ti64, tu8, 10 }, { ti64, ti16, 10 }, { ti64, tu16, 10 }, - { ti64, ti32, 10 }, { ti64, tu32, 10 }, { ti64, ti64, 10 }, { ti64, tu64, 10 }, - { ti64, tf32, 10 }, { ti64, tf64, 10 }, + {ti64, ti8, 10}, {ti64, tu8, 10}, {ti64, ti16, 10}, {ti64, tu16, 10}, + {ti64, ti32, 10}, {ti64, tu32, 10}, {ti64, ti64, 10}, {ti64, tu64, 10}, + {ti64, tf32, 10}, {ti64, tf64, 10}, - { tu64, ti8, 10 }, { tu64, tu8, 10 }, { tu64, ti16, 10 }, { tu64, tu16, 10 }, - { tu64, ti32, 10 }, { tu64, tu32, 10 }, { tu64, ti64, 10 }, { tu64, tu64, 10 }, - { tu64, tf32, 10 }, { tu64, tf64, 10 }, + {tu64, ti8, 10}, {tu64, tu8, 10}, {tu64, ti16, 10}, {tu64, tu16, 10}, + {tu64, ti32, 10}, {tu64, tu32, 10}, {tu64, ti64, 10}, {tu64, tu64, 10}, + {tu64, tf32, 10}, {tu64, tf64, 10}, - { tf32, ti8, 10 }, { tf32, tu8, 10 }, { tf32, ti16, 10 }, { tf32, tu16, 10 }, - { tf32, ti32, 10 }, { tf32, tu32, 10 }, { tf32, ti64, 10 }, { tf32, tu64, 10 }, - { tf32, tf32, 10 }, { tf32, tf64, 10 }, + {tf32, ti8, 10}, {tf32, tu8, 10}, {tf32, ti16, 10}, {tf32, tu16, 10}, + {tf32, ti32, 10}, {tf32, tu32, 10}, {tf32, ti64, 10}, {tf32, tu64, 10}, + {tf32, tf32, 10}, {tf32, tf64, 10}, - { tf64, ti8, 10 }, { tf64, tu8, 10 }, { tf64, ti16, 10 }, { tf64, tu16, 10 }, - { tf64, ti32, 10 }, { tf64, tu32, 10 }, { tf64, ti64, 10 }, { tf64, tu64, 10 }, - { tf64, tf32, 10 }, { tf64, tf64, 10 }, + {tf64, ti8, 10}, {tf64, tu8, 10}, {tf64, ti16, 10}, {tf64, tu16, 10}, + {tf64, ti32, 10}, {tf64, tu32, 10}, {tf64, ti64, 10}, {tf64, tu64, 10}, + {tf64, tf32, 10}, {tf64, tf64, 10}, /* value good in all signed types (-4) */ - { ti8, ti8, -4 }, { ti8, ti16, -4 }, - { ti8, ti32, -4 }, { ti8, ti64, -4 }, - { ti8, tf32, -4 }, { ti8, tf64, -4 }, + {ti8, ti8, -4}, {ti8, ti16, -4}, + {ti8, ti32, -4}, {ti8, ti64, -4}, + {ti8, tf32, -4}, {ti8, tf64, -4}, - { ti16, ti8, -4 }, { ti16, ti16, -4 }, - { ti16, ti32, -4 }, { ti16, ti64, -4 }, - { ti16, tf32, -4 }, + {ti16, ti8, -4}, {ti16, ti16, -4}, + {ti16, ti32, -4}, {ti16, ti64, -4}, + {ti16, tf32, -4}, - { ti32, ti8, -4 }, { ti32, ti16, -4 }, - { ti32, ti32, -4 }, { ti32, ti64, -4 }, - { ti32, tf32, -4 }, { ti32, tf64, -4 }, + {ti32, ti8, -4}, {ti32, ti16, -4}, + {ti32, ti32, -4}, {ti32, ti64, -4}, + {ti32, tf32, -4}, {ti32, tf64, -4}, - { ti64, ti8, -4 }, { ti64, ti16, -4 }, - { ti64, ti32, -4 }, { ti64, ti64, -4 }, - { ti64, tf32, -4 }, + {ti64, ti8, -4}, {ti64, ti16, -4}, + {ti64, ti32, -4}, {ti64, ti64, -4}, + {ti64, tf32, -4}, - { tf32, ti8, -4 }, { tf32, ti16, -4 }, - { tf32, ti32, -4 }, { tf32, ti64, -4 }, - { tf32, tf32, -4 }, + {tf32, ti8, -4}, {tf32, ti16, -4}, + {tf32, ti32, -4}, {tf32, ti64, -4}, + {tf32, tf32, -4}, - { tf64, ti8, -4 }, { tf64, ti16, -4 }, - { tf64, ti32, -4 }, { tf64, ti64, -4 }, - { tf64, tf32, -4 }, { tf64, tf64, -4 }, + {tf64, ti8, -4}, {tf64, ti16, -4}, + {tf64, ti32, -4}, {tf64, ti64, -4}, + {tf64, tf32, -4}, {tf64, tf64, -4}, /* value good in u8 and up (175) */ - { tu8, tu8, 175 }, { tu8, ti16, 175 }, { tu8, tu16, 175 }, - { tu8, ti32, 175 }, { tu8, tu32, 175 }, { tu8, ti64, 175 }, { tu8, tu64, 175 }, - { tu8, tf32, 175 }, { tu8, tf64, 175 }, + {tu8, tu8, 175}, {tu8, ti16, 175}, {tu8, tu16, 175}, + {tu8, ti32, 175}, {tu8, tu32, 175}, {tu8, ti64, 175}, {tu8, tu64, 175}, + {tu8, tf32, 175}, {tu8, tf64, 175}, - { ti16, tu8, 175 }, { ti16, ti16, 175 }, { ti16, tu16, 175 }, - { ti16, ti32, 175 }, { ti16, tu32, 175 }, { ti16, ti64, 175 }, { ti16, tu64, 175 }, - { ti16, tf32, 175 }, { ti16, tf64, 175 }, + {ti16, tu8, 175}, {ti16, ti16, 175}, {ti16, tu16, 175}, + {ti16, ti32, 175}, {ti16, tu32, 175}, {ti16, ti64, 175}, {ti16, tu64, 175}, + {ti16, tf32, 175}, {ti16, tf64, 175}, - { tu16, tu8, 175 }, { tu16, ti16, 175 }, { tu16, tu16, 175 }, - { tu16, ti32, 175 }, { tu16, tu32, 175 }, { tu16, ti64, 175 }, { tu16, tu64, 175 }, - { tu16, tf32, 175 }, { tu16, tf64, 175 }, + {tu16, tu8, 175}, {tu16, ti16, 175}, {tu16, tu16, 175}, + {tu16, ti32, 175}, {tu16, tu32, 175}, {tu16, ti64, 175}, {tu16, tu64, 175}, + {tu16, tf32, 175}, {tu16, tf64, 175}, - { ti32, tu8, 175 }, { ti32, ti16, 175 }, { ti32, tu16, 175 }, - { ti32, ti32, 175 }, { ti32, tu32, 175 }, { ti32, ti64, 175 }, { ti32, tu64, 175 }, - { ti32, tf32, 175 }, { ti32, tf64, 175 }, + {ti32, tu8, 175}, {ti32, ti16, 175}, {ti32, tu16, 175}, + {ti32, ti32, 175}, {ti32, tu32, 175}, {ti32, ti64, 175}, {ti32, tu64, 175}, + {ti32, tf32, 175}, {ti32, tf64, 175}, - { tu32, tu8, 175 }, { tu32, ti16, 175 }, { tu32, tu16, 175 }, - { tu32, ti32, 175 }, { tu32, tu32, 175 }, { tu32, ti64, 175 }, { tu32, tu64, 175 }, - { tu32, tf32, 175 }, { tu32, tf64, 175 }, + {tu32, tu8, 175}, {tu32, ti16, 175}, {tu32, tu16, 175}, + {tu32, ti32, 175}, {tu32, tu32, 175}, {tu32, ti64, 175}, {tu32, tu64, 175}, + {tu32, tf32, 175}, {tu32, tf64, 175}, - { ti64, tu8, 175 }, { ti64, ti16, 175 }, { ti64, tu16, 175 }, - { ti64, ti32, 175 }, { ti64, tu32, 175 }, { ti64, ti64, 175 }, { ti64, tu64, 175 }, - { ti64, tf32, 175 }, { ti64, tf64, 175 }, + {ti64, tu8, 175}, {ti64, ti16, 175}, {ti64, tu16, 175}, + {ti64, ti32, 175}, {ti64, tu32, 175}, {ti64, ti64, 175}, {ti64, tu64, 175}, + {ti64, tf32, 175}, {ti64, tf64, 175}, - { tu64, tu8, 175 }, { tu64, ti16, 175 }, { tu64, tu16, 175 }, - { tu64, ti32, 175 }, { tu64, tu32, 175 }, { tu64, ti64, 175 }, { tu64, tu64, 175 }, - { tu64, tf32, 175 }, { tu64, tf64, 175 }, + {tu64, tu8, 175}, {tu64, ti16, 175}, {tu64, tu16, 175}, + {tu64, ti32, 175}, {tu64, tu32, 175}, {tu64, ti64, 175}, {tu64, tu64, 175}, + {tu64, tf32, 175}, {tu64, tf64, 175}, - { tf32, tu8, 175 }, { tf32, ti16, 175 }, { tf32, tu16, 175 }, - { tf32, ti32, 175 }, { tf32, tu32, 175 }, { tf32, ti64, 175 }, { tf32, tu64, 175 }, - { tf32, tf32, 175 }, { tf32, tf64, 175 }, + {tf32, tu8, 175}, {tf32, ti16, 175}, {tf32, tu16, 175}, + {tf32, ti32, 175}, {tf32, tu32, 175}, {tf32, ti64, 175}, {tf32, tu64, 175}, + {tf32, tf32, 175}, {tf32, tf64, 175}, - { tf64, tu8, 175 }, { tf64, ti16, 175 }, { tf64, tu16, 175 }, - { tf64, ti32, 175 }, { tf64, tu32, 175 }, { tf64, ti64, 175 }, { tf64, tu64, 175 }, - { tf64, tf32, 175 }, { tf64, tf64, 175 }, + {tf64, tu8, 175}, {tf64, ti16, 175}, {tf64, tu16, 175}, + {tf64, ti32, 175}, {tf64, tu32, 175}, {tf64, ti64, 175}, {tf64, tu64, 175}, + {tf64, tf32, 175}, {tf64, tf64, 175}, /* value good in u16 and up (41259) */ - { tu16, tu16, 41259 }, - { tu16, ti32, 41259 }, { tu16, ti64, 41259 }, { tu16, tu64, 41259 }, - { tu16, tf32, 41259 }, { tu16, tf64, 41259 }, + {tu16, tu16, 41259}, + {tu16, ti32, 41259}, {tu16, ti64, 41259}, {tu16, tu64, 41259}, + {tu16, tf32, 41259}, {tu16, tf64, 41259}, - { ti32, tu16, 41259 }, - { ti32, ti32, 41259 }, { ti32, tu32, 41259 }, { ti32, ti64, 41259 }, { ti32, tu64, 41259 }, - { ti32, tf32, 41259 }, { ti32, tf64, 41259 }, + {ti32, tu16, 41259}, + {ti32, ti32, 41259}, {ti32, tu32, 41259}, {ti32, ti64, 41259}, {ti32, tu64, 41259}, + {ti32, tf32, 41259}, {ti32, tf64, 41259}, - { tu32, tu16, 41259 }, - { tu32, ti32, 41259 }, { tu32, tu32, 41259 }, { tu32, ti64, 41259 }, { tu32, tu64, 41259 }, - { tu32, tf32, 41259 }, { tu32, tf64, 41259 }, + {tu32, tu16, 41259}, + {tu32, ti32, 41259}, {tu32, tu32, 41259}, {tu32, ti64, 41259}, {tu32, tu64, 41259}, + {tu32, tf32, 41259}, {tu32, tf64, 41259}, - { ti64, tu16, 41259 }, - { ti64, ti32, 41259 }, { ti64, tu32, 41259 }, { ti64, ti64, 41259 }, { ti64, tu64, 41259 }, - { ti64, tf32, 41259 }, { ti64, tf64, 41259 }, + {ti64, tu16, 41259}, + {ti64, ti32, 41259}, {ti64, tu32, 41259}, {ti64, ti64, 41259}, {ti64, tu64, 41259}, + {ti64, tf32, 41259}, {ti64, tf64, 41259}, - { tu64, tu16, 41259 }, - { tu64, ti32, 41259 }, { tu64, tu32, 41259 }, { tu64, ti64, 41259 }, { tu64, tu64, 41259 }, - { tu64, tf32, 41259 }, { tu64, tf64, 41259 }, + {tu64, tu16, 41259}, + {tu64, ti32, 41259}, {tu64, tu32, 41259}, {tu64, ti64, 41259}, {tu64, tu64, 41259}, + {tu64, tf32, 41259}, {tu64, tf64, 41259}, - { tf32, tu16, 41259 }, - { tf32, ti32, 41259 }, { tf32, tu32, 41259 }, { tf32, ti64, 41259 }, { tf32, tu64, 41259 }, - { tf32, tf32, 41259 }, { tf32, tf64, 41259 }, + {tf32, tu16, 41259}, + {tf32, ti32, 41259}, {tf32, tu32, 41259}, {tf32, ti64, 41259}, {tf32, tu64, 41259}, + {tf32, tf32, 41259}, {tf32, tf64, 41259}, - { tf64, tu16, 41259 }, - { tf64, ti32, 41259 }, { tf64, tu32, 41259 }, { tf64, ti64, 41259 }, { tf64, tu64, 41259 }, - { tf64, tf32, 41259 }, { tf64, tf64, 41259 }, + {tf64, tu16, 41259}, + {tf64, ti32, 41259}, {tf64, tu32, 41259}, {tf64, ti64, 41259}, {tf64, tu64, 41259}, + {tf64, tf32, 41259}, {tf64, tf64, 41259}, /* value good in u32 and up (3758096384) */ - { tu32, tu32, 3758096384 }, { tu32, ti64, 3758096384 }, { tu32, tu64, 3758096384 }, - { tu32, tf32, 3758096384 }, { tu32, tf64, 3758096384 }, + {tu32, tu32, 3758096384}, {tu32, ti64, 3758096384}, {tu32, tu64, 3758096384}, + {tu32, tf32, 3758096384}, {tu32, tf64, 3758096384}, - { ti64, tu32, 3758096384 }, { ti64, ti64, 3758096384 }, { ti64, tu64, 3758096384 }, - { ti64, tf32, 3758096384 }, { ti64, tf64, 3758096384 }, + {ti64, tu32, 3758096384}, {ti64, ti64, 3758096384}, {ti64, tu64, 3758096384}, + {ti64, tf32, 3758096384}, {ti64, tf64, 3758096384}, - { tu64, tu32, 3758096384 }, { tu64, ti64, 3758096384 }, { tu64, tu64, 3758096384 }, - { tu64, tf32, 3758096384 }, { tu64, tf64, 3758096384 }, + {tu64, tu32, 3758096384}, {tu64, ti64, 3758096384}, {tu64, tu64, 3758096384}, + {tu64, tf32, 3758096384}, {tu64, tf64, 3758096384}, - { tf32, tu32, 3758096384 }, { tf32, ti64, 3758096384 }, { tf32, tu64, 3758096384 }, - { tf32, tf32, 3758096384 }, { tf32, tf64, 3758096384 }, + {tf32, tu32, 3758096384}, {tf32, ti64, 3758096384}, {tf32, tu64, 3758096384}, + {tf32, tf32, 3758096384}, {tf32, tf64, 3758096384}, - { tf64, tu32, 3758096384 }, { tf64, ti64, 3758096384 }, { tf64, tu64, 3758096384 }, - { tf64, tf32, 3758096384 }, { tf64, tf64, 3758096384 }, + {tf64, tu32, 3758096384}, {tf64, ti64, 3758096384}, {tf64, tu64, 3758096384}, + {tf64, tf32, 3758096384}, {tf64, tf64, 3758096384}, /* value good in u64 and up (16717361816799281152) */ - { tu64, tu64, 16717361816799281152 }, - { tu64, tf32, 16717361816799281152 }, { tu64, tf64, 16717361816799281152 }, + {tu64, tu64, 16717361816799281152}, + {tu64, tf32, 16717361816799281152}, {tu64, tf64, 16717361816799281152}, - { tf32, tu64, 16717361816799281152 }, - { tf32, tf32, 16717361816799281152 }, { tf32, tf64, 16717361816799281152 }, + {tf32, tu64, 16717361816799281152}, + {tf32, tf32, 16717361816799281152}, {tf32, tf64, 16717361816799281152}, - { tf64, tu64, 16717361816799281152 }, - { tf64, tf32, 16717361816799281152 }, { tf64, tf64, 16717361816799281152 }, + {tf64, tu64, 16717361816799281152}, + {tf64, tf32, 16717361816799281152}, {tf64, tf64, 16717361816799281152}, } func main() { - for i:=0; i 1e-6 { println(r, "!= 1.292308") @@ -32,7 +32,7 @@ func main() { } d = i + 0.1384615 if d < 0 { - d = - d + d = -d } if d > 1e-6 { println(i, "!= -0.1384615") diff --git a/test/ken/embed.go b/test/ken/embed.go index f7ca0665e26f8..2e46c34590817 100644 --- a/test/ken/embed.go +++ b/test/ken/embed.go @@ -8,7 +8,6 @@ package main - type I interface { test1() int test2() int diff --git a/test/ken/for.go b/test/ken/for.go index db35548db8511..4c257ffcc9ff6 100644 --- a/test/ken/for.go +++ b/test/ken/for.go @@ -8,12 +8,13 @@ package main -func -main() { - var t,i int; +func main() { + var t, i int - for i=0; i<100; i=i+1 { - t = t+i; + for i = 0; i < 100; i = i + 1 { + t = t + i + } + if t != 50*99 { + panic(t) } - if t != 50*99 { panic(t); } } diff --git a/test/ken/interfun.go b/test/ken/interfun.go index 9432181df2aee..47955c610f8bd 100644 --- a/test/ken/interfun.go +++ b/test/ken/interfun.go @@ -9,51 +9,64 @@ package main type S struct { - a,b int; + a, b int } type I1 interface { - f ()int; + f() int } type I2 interface { - g() int; - f() int; + g() int + f() int } -func (this *S) f()int { - return this.a; +func (this *S) f() int { + return this.a } -func (this *S) g()int { - return this.b; +func (this *S) g() int { + return this.b } -func -main() { - var i1 I1; - var i2 I2; - var g *S; +func main() { + var i1 I1 + var i2 I2 + var g *S - s := new(S); - s.a = 5; - s.b = 6; + s := new(S) + s.a = 5 + s.b = 6 // call structure - if s.f() != 5 { panic(11); } - if s.g() != 6 { panic(12); } + if s.f() != 5 { + panic(11) + } + if s.g() != 6 { + panic(12) + } - i1 = s; // convert S to I1 - i2 = i1.(I2); // convert I1 to I2 + i1 = s // convert S to I1 + i2 = i1.(I2) // convert I1 to I2 // call interface - if i1.f() != 5 { panic(21); } - if i2.f() != 5 { panic(22); } - if i2.g() != 6 { panic(23); } + if i1.f() != 5 { + panic(21) + } + if i2.f() != 5 { + panic(22) + } + if i2.g() != 6 { + panic(23) + } - g = i1.(*S); // convert I1 to S - if g != s { panic(31); } + g = i1.(*S) // convert I1 to S + if g != s { + panic(31) + } - g = i2.(*S); // convert I2 to S - if g != s { panic(32); } + g = i2.(*S) // convert I2 to S + if g != s { + panic(32) + } } diff --git a/test/ken/intervar.go b/test/ken/intervar.go index 8a2fca0d4bd06..9ae98d92d8384 100644 --- a/test/ken/intervar.go +++ b/test/ken/intervar.go @@ -8,60 +8,59 @@ package main -type Iputs interface { - puts (s string) string; +type Iputs interface { + puts(s string) string } // --------- -type Print struct { - whoami int; - put Iputs; +type Print struct { + whoami int + put Iputs } func (p *Print) dop() string { - r := " print " + string(p.whoami + '0') - return r + p.put.puts("abc"); + r := " print " + string(p.whoami+'0') + return r + p.put.puts("abc") } // --------- -type Bio struct { - whoami int; - put Iputs; +type Bio struct { + whoami int + put Iputs } func (b *Bio) puts(s string) string { - r := " bio " + string(b.whoami + '0') - return r + b.put.puts(s); + r := " bio " + string(b.whoami+'0') + return r + b.put.puts(s) } // --------- -type File struct { - whoami int; - put Iputs; +type File struct { + whoami int + put Iputs } func (f *File) puts(s string) string { - return " file " + string(f.whoami + '0') + " -- " + s + return " file " + string(f.whoami+'0') + " -- " + s } -func -main() { - p := new(Print); - b := new(Bio); - f := new(File); +func main() { + p := new(Print) + b := new(Bio) + f := new(File) - p.whoami = 1; - p.put = b; + p.whoami = 1 + p.put = b - b.whoami = 2; - b.put = f; + b.whoami = 2 + b.put = f - f.whoami = 3; + f.whoami = 3 - r := p.dop(); + r := p.dop() expected := " print 1 bio 2 file 3 -- abc" if r != expected { panic(r + " != " + expected) diff --git a/test/ken/litfun.go b/test/ken/litfun.go index e241d4edb798a..ba19ccf30576e 100644 --- a/test/ken/litfun.go +++ b/test/ken/litfun.go @@ -8,16 +8,17 @@ package main -func -main() { - x := func(a int)int { - x := func(a int)int { - x := func(a int)int { - return a+5; - }; - return x(a)+7; - }; - return x(a)+11; - }; - if x(3) != 3+5+7+11 { panic(x(3)); } +func main() { + x := func(a int) int { + x := func(a int) int { + x := func(a int) int { + return a + 5 + } + return x(a) + 7 + } + return x(a) + 11 + } + if x(3) != 3+5+7+11 { + panic(x(3)) + } } diff --git a/test/ken/mfunc.go b/test/ken/mfunc.go index ef2499194f7ad..3754bbf6a23ce 100644 --- a/test/ken/mfunc.go +++ b/test/ken/mfunc.go @@ -8,15 +8,15 @@ package main -func -main() { - var x,y int; +func main() { + var x, y int - x,y = simple(10,20,30); - if x+y != 65 { panic(x+y); } + x, y = simple(10, 20, 30) + if x+y != 65 { + panic(x + y) + } } -func -simple(ia,ib,ic int) (oa,ob int) { - return ia+5, ib+ic; +func simple(ia, ib, ic int) (oa, ob int) { + return ia + 5, ib + ic } diff --git a/test/ken/ptrfun.go b/test/ken/ptrfun.go index af806cfd9281a..2fc13a7ebbe98 100644 --- a/test/ken/ptrfun.go +++ b/test/ken/ptrfun.go @@ -9,37 +9,44 @@ package main type C struct { - a int; - x func(p *C)int; + a int + x func(p *C) int } -func (this *C) f()int { - return this.a; +func (this *C) f() int { + return this.a } -func -main() { - var v int; - var c *C; +func main() { + var v int + var c *C - c = new(C); - c.a = 6; - c.x = g; + c = new(C) + c.a = 6 + c.x = g - v = g(c); - if v != 6 { panic(v); } + v = g(c) + if v != 6 { + panic(v) + } - v = c.x(c); - if v != 6 { panic(v); } + v = c.x(c) + if v != 6 { + panic(v) + } - v = c.f(); - if v != 6 { panic(v); } + v = c.f() + if v != 6 { + panic(v) + } } -func g(p *C)int { - var v int; +func g(p *C) int { + var v int - v = p.a; - if v != 6 { panic(v); } - return p.a; + v = p.a + if v != 6 { + panic(v) + } + return p.a } diff --git a/test/ken/ptrvar.go b/test/ken/ptrvar.go index d78170c9d25a5..4d1b9eb794f5e 100644 --- a/test/ken/ptrvar.go +++ b/test/ken/ptrvar.go @@ -8,36 +8,49 @@ package main -type x2 struct { a,b,c int; d int; }; -var g1 x2; -var g2 struct { a,b,c int; d x2; }; - -func -main() { - var x int; - var s1 *x2; - var s2 *struct { a,b,c int; d x2; }; - - s1 = &g1; - s2 = &g2; - - s1.a = 1; - s1.b = 2; - s1.c = 3; - s1.d = 5; - - s2.a = 7; - s2.b = 11; - s2.c = 13; - s2.d.a = 17; - s2.d.b = 19; - s2.d.c = 23; - s2.d.d = 20; - - if(s2.d.c != 23) { panic(1); } - if(g2.d.c != 23) { panic(2); } - - x = s1.a + +type x2 struct { + a, b, c int + d int +} + +var g1 x2 +var g2 struct { + a, b, c int + d x2 +} + +func main() { + var x int + var s1 *x2 + var s2 *struct { + a, b, c int + d x2 + } + + s1 = &g1 + s2 = &g2 + + s1.a = 1 + s1.b = 2 + s1.c = 3 + s1.d = 5 + + s2.a = 7 + s2.b = 11 + s2.c = 13 + s2.d.a = 17 + s2.d.b = 19 + s2.d.c = 23 + s2.d.d = 20 + + if s2.d.c != 23 { + panic(1) + } + if g2.d.c != 23 { + panic(2) + } + + x = s1.a + s1.b + s1.c + s1.d + @@ -48,7 +61,9 @@ main() { s2.d.a + s2.d.b + s2.d.c + - s2.d.d; + s2.d.d - if(x != 121) { panic(x); } + if x != 121 { + panic(x) + } } diff --git a/test/ken/robfor.go b/test/ken/robfor.go index c6a420b39d712..3269c0714bb17 100644 --- a/test/ken/robfor.go +++ b/test/ken/robfor.go @@ -10,49 +10,49 @@ package main func assertequal(is, shouldbe int, msg string) { if is != shouldbe { - print("assertion fail" + msg + "\n"); - panic(1); + print("assertion fail" + msg + "\n") + panic(1) } } func main() { - var i, sum int; + var i, sum int - i = 0; + i = 0 for { - i = i + 1; + i = i + 1 if i > 5 { - break; + break } } - assertequal(i, 6, "break"); + assertequal(i, 6, "break") - sum = 0; + sum = 0 for i := 0; i <= 10; i++ { - sum = sum + i; + sum = sum + i } - assertequal(sum, 55, "all three"); + assertequal(sum, 55, "all three") - sum = 0; + sum = 0 for i := 0; i <= 10; { - sum = sum + i; - i++; + sum = sum + i + i++ } - assertequal(sum, 55, "only two"); + assertequal(sum, 55, "only two") - sum = 0; + sum = 0 for sum < 100 { - sum = sum + 9; + sum = sum + 9 } - assertequal(sum, 99 + 9, "only one"); + assertequal(sum, 99+9, "only one") - sum = 0; + sum = 0 for i := 0; i <= 10; i++ { - if i % 2 == 0 { - continue; + if i%2 == 0 { + continue } - sum = sum + i; + sum = sum + i } - assertequal(sum, 1+3+5+7+9, "continue"); + assertequal(sum, 1+3+5+7+9, "continue") } diff --git a/test/ken/robfunc.go b/test/ken/robfunc.go index 885267e30c2a6..6a417c073f784 100644 --- a/test/ken/robfunc.go +++ b/test/ken/robfunc.go @@ -41,7 +41,6 @@ func f7(a int) (x int, y float64) { return 7, 7.0 } - func f8(a int) (x int, y float64) { return 8, 8.0 } @@ -54,14 +53,12 @@ func (t *T) m10(a int, b float64) int { return (t.x + a) * (t.y + int(b)) } - func f9(a int) (in int, fl float64) { i := 9 f := float64(9) return i, f } - func main() { f1() f2(1) diff --git a/test/ken/shift.go b/test/ken/shift.go index af8789615ee5d..895e7e90aa72e 100644 --- a/test/ken/shift.go +++ b/test/ken/shift.go @@ -8,114 +8,122 @@ package main -var ians [18]int; -var uans [18]uint; -var pass string; +var ians [18]int +var uans [18]uint +var pass string -func -testi(i int, t1,t2,t3 int) { - n := ((t1*3) + t2)*2 + t3; +func testi(i int, t1, t2, t3 int) { + n := ((t1*3)+t2)*2 + t3 if i != ians[n] { - print("itest ", t1,t2,t3,pass, - " is ", i, " sb ", ians[n], "\n"); + print("itest ", t1, t2, t3, pass, + " is ", i, " sb ", ians[n], "\n") } } -func -index(t1,t2,t3 int) int { - return ((t1*3) + t2)*2 + t3; +func index(t1, t2, t3 int) int { + return ((t1*3)+t2)*2 + t3 } -func -testu(u uint, t1,t2,t3 int) { - n := index(t1,t2,t3); +func testu(u uint, t1, t2, t3 int) { + n := index(t1, t2, t3) if u != uans[n] { - print("utest ", t1,t2,t3,pass, - " is ", u, " sb ", uans[n], "\n"); + print("utest ", t1, t2, t3, pass, + " is ", u, " sb ", uans[n], "\n") } } -func -main() { - var i int; - var u,c uint; +func main() { + var i int + var u, c uint /* * test constant evaluations */ - pass = "con"; // constant part + pass = "con" // constant part - testi( int(1234) << 0, 0,0,0); - testi( int(1234) >> 0, 0,0,1); - testi( int(1234) << 5, 0,1,0); - testi( int(1234) >> 5, 0,1,1); + testi(int(1234)<<0, 0, 0, 0) + testi(int(1234)>>0, 0, 0, 1) + testi(int(1234)<<5, 0, 1, 0) + testi(int(1234)>>5, 0, 1, 1) - testi(int(-1234) << 0, 1,0,0); - testi(int(-1234) >> 0, 1,0,1); - testi(int(-1234) << 5, 1,1,0); - testi(int(-1234) >> 5, 1,1,1); + testi(int(-1234)<<0, 1, 0, 0) + testi(int(-1234)>>0, 1, 0, 1) + testi(int(-1234)<<5, 1, 1, 0) + testi(int(-1234)>>5, 1, 1, 1) - testu(uint(5678) << 0, 2,0,0); - testu(uint(5678) >> 0, 2,0,1); - testu(uint(5678) << 5, 2,1,0); - testu(uint(5678) >> 5, 2,1,1); + testu(uint(5678)<<0, 2, 0, 0) + testu(uint(5678)>>0, 2, 0, 1) + testu(uint(5678)<<5, 2, 1, 0) + testu(uint(5678)>>5, 2, 1, 1) /* * test variable evaluations */ - pass = "var"; // variable part - - for t1:=0; t1<3; t1++ { // +int, -int, uint - for t2:=0; t2<3; t2++ { // 0, +small, +large - for t3:=0; t3<2; t3++ { // <<, >> - switch t1 { - case 0: i = 1234; - case 1: i = -1234; - case 2: u = 5678; + pass = "var" // variable part + + for t1 := 0; t1 < 3; t1++ { // +int, -int, uint + for t2 := 0; t2 < 3; t2++ { // 0, +small, +large + for t3 := 0; t3 < 2; t3++ { // <<, >> + switch t1 { + case 0: + i = 1234 + case 1: + i = -1234 + case 2: + u = 5678 + } + switch t2 { + case 0: + c = 0 + case 1: + c = 5 + case 2: + c = 1025 + } + switch t3 { + case 0: + i <<= c + u <<= c + case 1: + i >>= c + u >>= c + } + switch t1 { + case 0: + testi(i, t1, t2, t3) + case 1: + testi(i, t1, t2, t3) + case 2: + testu(u, t1, t2, t3) + } + } } - switch t2 { - case 0: c = 0; - case 1: c = 5; - case 2: c = 1025; - } - switch t3 { - case 0: i <<= c; u <<= c; - case 1: i >>= c; u >>= c; - } - switch t1 { - case 0: testi(i,t1,t2,t3); - case 1: testi(i,t1,t2,t3); - case 2: testu(u,t1,t2,t3); - } - } - } } } -func -init() { +func init() { /* * set the 'correct' answer */ - ians[index(0,0,0)] = 1234; - ians[index(0,0,1)] = 1234; - ians[index(0,1,0)] = 39488; - ians[index(0,1,1)] = 38; - ians[index(0,2,0)] = 0; - ians[index(0,2,1)] = 0; - - ians[index(1,0,0)] = -1234; - ians[index(1,0,1)] = -1234; - ians[index(1,1,0)] = -39488; - ians[index(1,1,1)] = -39; - ians[index(1,2,0)] = 0; - ians[index(1,2,1)] = -1; - - uans[index(2,0,0)] = 5678; - uans[index(2,0,1)] = 5678; - uans[index(2,1,0)] = 181696; - uans[index(2,1,1)] = 177; - uans[index(2,2,0)] = 0; - uans[index(2,2,1)] = 0; + ians[index(0, 0, 0)] = 1234 + ians[index(0, 0, 1)] = 1234 + ians[index(0, 1, 0)] = 39488 + ians[index(0, 1, 1)] = 38 + ians[index(0, 2, 0)] = 0 + ians[index(0, 2, 1)] = 0 + + ians[index(1, 0, 0)] = -1234 + ians[index(1, 0, 1)] = -1234 + ians[index(1, 1, 0)] = -39488 + ians[index(1, 1, 1)] = -39 + ians[index(1, 2, 0)] = 0 + ians[index(1, 2, 1)] = -1 + + uans[index(2, 0, 0)] = 5678 + uans[index(2, 0, 1)] = 5678 + uans[index(2, 1, 0)] = 181696 + uans[index(2, 1, 1)] = 177 + uans[index(2, 2, 0)] = 0 + uans[index(2, 2, 1)] = 0 } diff --git a/test/ken/simparray.go b/test/ken/simparray.go index 0e81a341b8563..51bbeaae8300e 100644 --- a/test/ken/simparray.go +++ b/test/ken/simparray.go @@ -8,43 +8,48 @@ package main -var b[10] float32; +var b [10]float32 -func -main() { - var a[10] float32; +func main() { + var a [10]float32 - for i:=int16(5); i<10; i=i+1 { - a[i] = float32(i); + for i := int16(5); i < 10; i = i + 1 { + a[i] = float32(i) } - s1 := float32(0); - for i:=5; i<10; i=i+1 { - s1 = s1 + a[i]; + s1 := float32(0) + for i := 5; i < 10; i = i + 1 { + s1 = s1 + a[i] } - if s1 != 35 { panic(s1); } + if s1 != 35 { + panic(s1) + } - for i:=int16(5); i<10; i=i+1 { - b[i] = float32(i); + for i := int16(5); i < 10; i = i + 1 { + b[i] = float32(i) } - s2 := float32(0); - for i:=5; i<10; i=i+1 { - s2 = s2 + b[i]; + s2 := float32(0) + for i := 5; i < 10; i = i + 1 { + s2 = s2 + b[i] } - if s2 != 35 { panic(s2); } + if s2 != 35 { + panic(s2) + } - b := new([100]int); - for i:=0; i<100; i=i+1 { - b[i] = i; + b := new([100]int) + for i := 0; i < 100; i = i + 1 { + b[i] = i } - s3 := 0; - for i:=0; i<100; i=i+1 { - s3 = s3+b[i]; + s3 := 0 + for i := 0; i < 100; i = i + 1 { + s3 = s3 + b[i] } - if s3 != 4950 { panic(s3); } + if s3 != 4950 { + panic(s3) + } } diff --git a/test/ken/simpbool.go b/test/ken/simpbool.go index ab2ecc21aad76..25c10cfcfe340 100644 --- a/test/ken/simpbool.go +++ b/test/ken/simpbool.go @@ -9,99 +9,186 @@ package main type s struct { - a bool; - b bool; + a bool + b bool } -func -main() { - var a,b bool; - - a = true; - b = false; - - if !a { panic(1); } - if b { panic(2); } - if !!!a { panic(3); } - if !!b { panic(4); } - - a = !b; - if !a { panic(5); } - if !!!a { panic(6); } - - var x *s; - x = new(s); - x.a = true; - x.b = false; - - if !x.a { panic(7); } - if x.b { panic(8); } - if !!!x.a { panic(9); } - if !!x.b { panic(10); } - - x.a = !x.b; - if !x.a { panic(11); } - if !!!x.a { panic(12); } +func main() { + var a, b bool + + a = true + b = false + + if !a { + panic(1) + } + if b { + panic(2) + } + if !!!a { + panic(3) + } + if !!b { + panic(4) + } + + a = !b + if !a { + panic(5) + } + if !!!a { + panic(6) + } + + var x *s + x = new(s) + x.a = true + x.b = false + + if !x.a { + panic(7) + } + if x.b { + panic(8) + } + if !!!x.a { + panic(9) + } + if !!x.b { + panic(10) + } + + x.a = !x.b + if !x.a { + panic(11) + } + if !!!x.a { + panic(12) + } /* * test && */ - a = true; - b = true; - if !(a && b) { panic(21); } - if a && !b { panic(22); } - if !a && b { panic(23); } - if !a && !b { panic(24); } - - a = false; - b = true; - if !(!a && b) { panic(31); } - if !a && !b { panic(32); } - if a && b { panic(33); } - if a && !b { panic(34); } - - a = true; - b = false; - if !(a && !b) { panic(41); } - if a && b { panic(41); } - if !a && !b { panic(41); } - if !a && b { panic(44); } - - a = false; - b = false; - if !(!a && !b) { panic(51); } - if !a && b { panic(52); } - if a && !b { panic(53); } - if a && b { panic(54); } + a = true + b = true + if !(a && b) { + panic(21) + } + if a && !b { + panic(22) + } + if !a && b { + panic(23) + } + if !a && !b { + panic(24) + } + + a = false + b = true + if !(!a && b) { + panic(31) + } + if !a && !b { + panic(32) + } + if a && b { + panic(33) + } + if a && !b { + panic(34) + } + + a = true + b = false + if !(a && !b) { + panic(41) + } + if a && b { + panic(41) + } + if !a && !b { + panic(41) + } + if !a && b { + panic(44) + } + + a = false + b = false + if !(!a && !b) { + panic(51) + } + if !a && b { + panic(52) + } + if a && !b { + panic(53) + } + if a && b { + panic(54) + } /* * test || */ - a = true; - b = true; - if !(a || b) { panic(61); } - if !(a || !b) { panic(62); } - if !(!a || b) { panic(63); } - if !a || !b { panic(64); } - - a = false; - b = true; - if !(!a || b) { panic(71); } - if !(!a || !b) { panic(72); } - if !(a || b) { panic(73); } - if a || !b { panic(74); } - - a = true; - b = false; - if !(a || !b) { panic(81); } - if !(a || b) { panic(82); } - if !(!a || !b) { panic(83); } - if !a || b { panic(84); } - - a = false; - b = false; - if !(!a || !b) { panic(91); } - if !(!a || b) { panic(92); } - if !(a || !b) { panic(93); } - if a || b { panic(94); } + a = true + b = true + if !(a || b) { + panic(61) + } + if !(a || !b) { + panic(62) + } + if !(!a || b) { + panic(63) + } + if !a || !b { + panic(64) + } + + a = false + b = true + if !(!a || b) { + panic(71) + } + if !(!a || !b) { + panic(72) + } + if !(a || b) { + panic(73) + } + if a || !b { + panic(74) + } + + a = true + b = false + if !(a || !b) { + panic(81) + } + if !(a || b) { + panic(82) + } + if !(!a || !b) { + panic(83) + } + if !a || b { + panic(84) + } + + a = false + b = false + if !(!a || !b) { + panic(91) + } + if !(!a || b) { + panic(92) + } + if !(a || !b) { + panic(93) + } + if a || b { + panic(94) + } } diff --git a/test/ken/simpfun.go b/test/ken/simpfun.go index e5dc2b24955bf..1d5534b9faa67 100644 --- a/test/ken/simpfun.go +++ b/test/ken/simpfun.go @@ -8,19 +8,21 @@ package main -func -main() { - var x int; +func main() { + var x int - x = fun(10,20,30); - if x != 60 { panic(x); } + x = fun(10, 20, 30) + if x != 60 { + panic(x) + } } -func -fun(ia,ib,ic int)int { - var o int; +func fun(ia, ib, ic int) int { + var o int - o = ia+ib+ic; - if o != 60 { panic(o); } - return o; + o = ia + ib + ic + if o != 60 { + panic(o) + } + return o } diff --git a/test/ken/simpvar.go b/test/ken/simpvar.go index c6eefbb5addb4..039d32c94e3e3 100644 --- a/test/ken/simpvar.go +++ b/test/ken/simpvar.go @@ -6,22 +6,22 @@ // Test scoping of variables. - package main -var x,y int; +var x, y int -func -main() { +func main() { - x = 15; - y = 20; + x = 15 + y = 20 { - var x int; - x = 25; - y = 25; - _ = x; + var x int + x = 25 + y = 25 + _ = x + } + x = x + y + if x != 40 { + panic(x) } - x = x+y; - if(x != 40) { panic(x); } } diff --git a/test/ken/strvar.go b/test/ken/strvar.go index 4d511fe6735db..826d796e011ec 100644 --- a/test/ken/strvar.go +++ b/test/ken/strvar.go @@ -8,40 +8,60 @@ package main -type x2 struct { a,b,c int; d int; }; -var g1 x2; -var g2 struct { a,b,c int; d x2; }; - -func -main() { - var x int; - var s1 *x2; - var s2 *struct { a,b,c int; d x2; }; - var s3 struct { a,b,c int; d x2; }; - - s1 = &g1; - s2 = &g2; - - s1.a = 1; - s1.b = 2; - s1.c = 3; - s1.d = 5; - - if(s1.c != 3) { panic(s1.c); } - if(g1.c != 3) { panic(g1.c); } - - s2.a = 7; - s2.b = 11; - s2.c = 13; - s2.d.a = 17; - s2.d.b = 19; - s2.d.c = 23; - s2.d.d = 29; - - if(s2.d.c != 23) { panic(s2.d.c); } - if(g2.d.c != 23) { panic(g2.d.c); } - - x = s1.a + +type x2 struct { + a, b, c int + d int +} + +var g1 x2 +var g2 struct { + a, b, c int + d x2 +} + +func main() { + var x int + var s1 *x2 + var s2 *struct { + a, b, c int + d x2 + } + var s3 struct { + a, b, c int + d x2 + } + + s1 = &g1 + s2 = &g2 + + s1.a = 1 + s1.b = 2 + s1.c = 3 + s1.d = 5 + + if s1.c != 3 { + panic(s1.c) + } + if g1.c != 3 { + panic(g1.c) + } + + s2.a = 7 + s2.b = 11 + s2.c = 13 + s2.d.a = 17 + s2.d.b = 19 + s2.d.c = 23 + s2.d.d = 29 + + if s2.d.c != 23 { + panic(s2.d.c) + } + if g2.d.c != 23 { + panic(g2.d.c) + } + + x = s1.a + s1.b + s1.c + s1.d + @@ -52,28 +72,34 @@ main() { s2.d.a + s2.d.b + s2.d.c + - s2.d.d; + s2.d.d - if(x != 130) { panic(x); } + if x != 130 { + panic(x) + } // test an automatic struct - s3.a = 7; - s3.b = 11; - s3.c = 13; - s3.d.a = 17; - s3.d.b = 19; - s3.d.c = 23; - s3.d.d = 29; - - if(s3.d.c != 23) { panic(s3.d.c); } - - x = s3.a + + s3.a = 7 + s3.b = 11 + s3.c = 13 + s3.d.a = 17 + s3.d.b = 19 + s3.d.c = 23 + s3.d.d = 29 + + if s3.d.c != 23 { + panic(s3.d.c) + } + + x = s3.a + s3.b + s3.c + s3.d.a + s3.d.b + s3.d.c + - s3.d.d; + s3.d.d - if(x != 119) { panic(x); } + if x != 119 { + panic(x) + } } diff --git a/test/live1.go b/test/live1.go index 87c8c97c41cb1..3d37b9ec53bb9 100644 --- a/test/live1.go +++ b/test/live1.go @@ -43,4 +43,3 @@ func f1(pkg, typ, meth string) { func f2() interface{} { return new(int) } - diff --git a/test/map1.go b/test/map1.go index 498c2ec45bd88..91589a7c486f7 100644 --- a/test/map1.go +++ b/test/map1.go @@ -39,10 +39,10 @@ var ( _ map[[]int]v // ERROR "invalid map key" _ map[func()]v // ERROR "invalid map key" _ map[map[int]int]v // ERROR "invalid map key" - _ map[T1]v // ERROR "invalid map key" - _ map[T2]v // ERROR "invalid map key" - _ map[T3]v // ERROR "invalid map key" - _ map[T4]v // ERROR "invalid map key" + _ map[T1]v // ERROR "invalid map key" + _ map[T2]v // ERROR "invalid map key" + _ map[T3]v // ERROR "invalid map key" + _ map[T4]v // ERROR "invalid map key" _ map[T5]v _ map[T6]v _ map[T7]v @@ -50,14 +50,14 @@ var ( ) type T1 []int -type T2 struct { F T1 } +type T2 struct{ F T1 } type T3 []T4 -type T4 struct { F T3 } +type T4 struct{ F T3 } type T5 *int -type T6 struct { F T5 } +type T6 struct{ F T5 } type T7 *T4 -type T8 struct { F *T7 } +type T8 struct{ F *T7 } func main() { m := make(map[int]int) @@ -65,4 +65,4 @@ func main() { delete(m) // ERROR "missing second \(key\) argument" delete(m, 2, 3) // ERROR "too many arguments" delete(1, m) // ERROR "first argument to delete must be map" -} \ No newline at end of file +} diff --git a/test/method5.go b/test/method5.go index d87bb6f5b27d0..e48baf4cccb8b 100644 --- a/test/method5.go +++ b/test/method5.go @@ -16,53 +16,53 @@ type Tinter interface { type Tsmallv byte -func (v Tsmallv) M(x int, b byte) (byte, int) { return b, x+int(v) } +func (v Tsmallv) M(x int, b byte) (byte, int) { return b, x + int(v) } type Tsmallp byte -func (p *Tsmallp) M(x int, b byte) (byte, int) { return b, x+int(*p) } +func (p *Tsmallp) M(x int, b byte) (byte, int) { return b, x + int(*p) } type Twordv uintptr -func (v Twordv) M(x int, b byte) (byte, int) { return b, x+int(v) } +func (v Twordv) M(x int, b byte) (byte, int) { return b, x + int(v) } type Twordp uintptr -func (p *Twordp) M(x int, b byte) (byte, int) { return b, x+int(*p) } +func (p *Twordp) M(x int, b byte) (byte, int) { return b, x + int(*p) } type Tbigv [2]uintptr -func (v Tbigv) M(x int, b byte) (byte, int) { return b, x+int(v[0])+int(v[1]) } +func (v Tbigv) M(x int, b byte) (byte, int) { return b, x + int(v[0]) + int(v[1]) } type Tbigp [2]uintptr -func (p *Tbigp) M(x int, b byte) (byte, int) { return b, x+int(p[0])+int(p[1]) } +func (p *Tbigp) M(x int, b byte) (byte, int) { return b, x + int(p[0]) + int(p[1]) } // Again, with an unexported method. type tsmallv byte -func (v tsmallv) m(x int, b byte) (byte, int) { return b, x+int(v) } +func (v tsmallv) m(x int, b byte) (byte, int) { return b, x + int(v) } type tsmallp byte -func (p *tsmallp) m(x int, b byte) (byte, int) { return b, x+int(*p) } +func (p *tsmallp) m(x int, b byte) (byte, int) { return b, x + int(*p) } type twordv uintptr -func (v twordv) m(x int, b byte) (byte, int) { return b, x+int(v) } +func (v twordv) m(x int, b byte) (byte, int) { return b, x + int(v) } type twordp uintptr -func (p *twordp) m(x int, b byte) (byte, int) { return b, x+int(*p) } +func (p *twordp) m(x int, b byte) (byte, int) { return b, x + int(*p) } type tbigv [2]uintptr -func (v tbigv) m(x int, b byte) (byte, int) { return b, x+int(v[0])+int(v[1]) } +func (v tbigv) m(x int, b byte) (byte, int) { return b, x + int(v[0]) + int(v[1]) } type tbigp [2]uintptr -func (p *tbigp) m(x int, b byte) (byte, int) { return b, x+int(p[0])+int(p[1]) } +func (p *tbigp) m(x int, b byte) (byte, int) { return b, x + int(p[0]) + int(p[1]) } type tinter interface { m(int, byte) (byte, int) @@ -85,7 +85,7 @@ type T3 struct { type T4 struct { } -func (t4 T4) M(x int, b byte) (byte, int) { return b, x+40 } +func (t4 T4) M(x int, b byte) (byte, int) { return b, x + 40 } var failed = false @@ -95,7 +95,7 @@ func CheckI(name string, i Tinter, inc int) { failed = true print(name, ".M(1000, 99) = ", b, ", ", x, " want 99, ", 1000+inc, "\n") } - + CheckF("(i="+name+")", i.M, inc) } @@ -113,7 +113,7 @@ func checkI(name string, i tinter, inc int) { failed = true print(name, ".m(1000, 99) = ", b, ", ", x, " want 99, ", 1000+inc, "\n") } - + checkF("(i="+name+")", i.m, inc) } @@ -183,8 +183,8 @@ func main() { CheckI("pbv", pbv, 11) CheckF("pbv.M", pbv.M, 11) CheckF("(*pbv).M", (*pbv).M, 11) - - bp := Tbigp([2]uintptr{7,8}) + + bp := Tbigp([2]uintptr{7, 8}) CheckI("&bp", &bp, 15) CheckF("bp.M", bp.M, 15) CheckF("(&bp).M", (&bp).M, 15) @@ -237,8 +237,8 @@ func main() { checkI("_pbv", _pbv, 11) checkF("_pbv.m", _pbv.m, 11) checkF("(*_pbv).m", (*_pbv).m, 11) - - _bp := tbigp([2]uintptr{7,8}) + + _bp := tbigp([2]uintptr{7, 8}) checkI("&_bp", &_bp, 15) checkF("_bp.m", _bp.m, 15) checkF("(&_bp).m", (&_bp).m, 15) @@ -246,7 +246,7 @@ func main() { checkI("_pbp", _pbp, 15) checkF("_pbp.m", _pbp.m, 15) checkF("(*_pbp).m", (*_pbp).m, 15) - + t4 := T4{} t3 := T3{&t4} t2 := T2{&t3} @@ -259,7 +259,7 @@ func main() { CheckI("&t2", &t2, 40) CheckI("t1", t1, 40) CheckI("&t1", &t1, 40) - + // x.M panics if x is an interface type and is nil, // or if x.M expands to (*x).M where x is nil, // or if x.M expands to x.y.z.w.M where something @@ -281,7 +281,7 @@ func main() { if f != nil { panic("something set f") } - + // x.M does not panic if x is a nil pointer and // M is a method with a pointer receiver. shouldNotPanic(func() { psp = nil; f = psp.M }) diff --git a/test/named.go b/test/named.go index 9763c76bfdf27..60a88c542bf33 100644 --- a/test/named.go +++ b/test/named.go @@ -31,7 +31,6 @@ func asString(String) {} func (Map) M() {} - // These functions check at run time that the default type // (in the absence of any implicit conversion hints) // is the given type. diff --git a/test/nilptr2.go b/test/nilptr2.go index a5c036999a748..c1bb30d279c40 100644 --- a/test/nilptr2.go +++ b/test/nilptr2.go @@ -27,7 +27,7 @@ func main() { var intp *int var slicep *[]byte var a10p *[10]int -var a10Mp *[1<<20]int +var a10Mp *[1 << 20]int var structp *Struct var bigstructp *BigStruct var i int @@ -38,9 +38,9 @@ var m2 *M2 func use(interface{}) { } -var tests = []struct{ +var tests = []struct { name string - fn func() + fn func() }{ // Edit .+1,/^}/s/^[^ ].+/ {"&", func() { println(&) }},\n {"\&&", func() { println(\&&) }},/g {"*intp", func() { println(*intp) }}, @@ -109,14 +109,14 @@ type BigStruct struct { i int j float64 k string - x [128<<20]byte + x [128 << 20]byte l []byte } type M struct { } -func (m *M) F() int {return 0} +func (m *M) F() int { return 0 } type M1 struct { M diff --git a/test/parentype.go b/test/parentype.go index eafa076481a88..d7881129c518b 100644 --- a/test/parentype.go +++ b/test/parentype.go @@ -11,9 +11,9 @@ package main func f(interface{}) func g() {} func main() { - f(map[string]string{"a":"b","c":"d"}) - f([...]int{1,2,3}) - f(map[string]func(){"a":g,"c":g}) - f(make(chan(<-chan int))) - f(make(chan<-(chan int))) + f(map[string]string{"a": "b", "c": "d"}) + f([...]int{1, 2, 3}) + f(map[string]func(){"a": g, "c": g}) + f(make(chan (<-chan int))) + f(make(chan<- (chan int))) } diff --git a/test/printbig.go b/test/printbig.go index 9e08c39adc232..a4af1fc9e1e48 100644 --- a/test/printbig.go +++ b/test/printbig.go @@ -9,6 +9,6 @@ package main func main() { - print(-(1<<63), "\n") + print(-(1 << 63), "\n") print((1<<63)-1, "\n") } diff --git a/test/recover1.go b/test/recover1.go index c14a607c6ba4a..7e7c2c5968c4c 100644 --- a/test/recover1.go +++ b/test/recover1.go @@ -22,21 +22,21 @@ func main() { } func die() { - runtime.Breakpoint() // can't depend on panic + runtime.Breakpoint() // can't depend on panic } func mustRecover(x interface{}) { - mustNotRecover() // because it's not a defer call + mustNotRecover() // because it's not a defer call v := recover() if v == nil { println("missing recover") - die() // panic is useless here + die() // panic is useless here } if v != x { println("wrong value", v, x) die() } - + // the value should be gone now regardless v = recover() if v != nil { @@ -54,7 +54,7 @@ func mustNotRecover() { } func withoutRecover() { - mustNotRecover() // because it's a sub-call + mustNotRecover() // because it's a sub-call } func test1() { @@ -116,7 +116,7 @@ func test6() { // Like test3, but changed recover to defer (same change as test4 → test5). defer mustNotRecover() defer func() { - defer recover() // like a normal call from this func; runs because mustRecover stops the panic + defer recover() // like a normal call from this func; runs because mustRecover stops the panic defer mustRecover(3) panic(3) }() @@ -134,7 +134,7 @@ func test7() { defer mustRecover(2) defer func() { defer mustRecover(3) - defer recover() // now a no-op, unlike in test6. + defer recover() // now a no-op, unlike in test6. panic(3) }() panic(2) diff --git a/test/return.go b/test/return.go index 95f94b9276c78..20f648cf46225 100644 --- a/test/return.go +++ b/test/return.go @@ -151,27 +151,31 @@ func _() int { func _() int { print(1) return 2 - {} + { + } } // ERROR "missing return" func _() int { L: print(1) goto L - {} + { + } } // ERROR "missing return" func _() int { print(1) panic(2) - {} + { + } } // ERROR "missing return" func _() int { { print(1) return 2 - {} + { + } } } // ERROR "missing return" @@ -180,7 +184,8 @@ L: { print(1) goto L - {} + { + } } } // ERROR "missing return" @@ -188,7 +193,8 @@ func _() int { print(1) { panic(2) - {} + { + } } } // ERROR "missing return" @@ -197,7 +203,8 @@ func _() int { print(1) return 2 } - {} + { + } } // ERROR "missing return" func _() int { @@ -206,7 +213,8 @@ L: print(1) goto L } - {} + { + } } // ERROR "missing return" func _() int { @@ -214,7 +222,8 @@ func _() int { { panic(2) } - {} + { + } } // ERROR "missing return" // if-else chain with final else and all terminating is okay @@ -282,12 +291,12 @@ func _() int { } } // ERROR "missing return" - // for { loops that never break are okay. func _() int { print(1) - for {} + for { + } } func _() int { @@ -300,7 +309,7 @@ func _() int { func _() int { for { - L: + L: for { break L } @@ -311,7 +320,9 @@ func _() int { func _() int { print(1) - for { break } + for { + break + } } // ERROR "missing return" func _() int { @@ -335,7 +346,8 @@ L: func _() int { print(1) - for x == nil {} + for x == nil { + } } // ERROR "missing return" func _() int { @@ -348,16 +360,17 @@ func _() int { func _() int { for x == nil { - L: + L: for { break L } - } + } } // ERROR "missing return" func _() int { print(1) - for true {} + for true { + } } // ERROR "missing return" func _() int { @@ -370,7 +383,7 @@ func _() int { func _() int { for true { - L: + L: for { break L } @@ -381,7 +394,7 @@ func _() int { func _() int { print(1) - select{} + select {} } func _() int { @@ -398,7 +411,8 @@ func _() int { select { case <-c: print(2) - for{} + for { + } } } @@ -422,7 +436,7 @@ func _() int { print(2) panic("abc") default: - select{} + select {} } } @@ -449,7 +463,6 @@ L: } } // ERROR "missing return" - func _() int { print(1) select { @@ -461,12 +474,14 @@ func _() int { } } // ERROR "missing return" - // if any breaks refer to the select, the select isn't okay anymore, even if they're dead func _() int { print(1) - select{ default: break } + select { + default: + break + } } // ERROR "missing return" func _() int { @@ -485,7 +500,9 @@ L: select { case <-c: print(2) - for{ break L } + for { + break L + } } } // ERROR "missing return" @@ -509,7 +526,7 @@ func _() int { print(1) panic("abc") default: - select{} + select {} break } } // ERROR "missing return" @@ -557,7 +574,6 @@ func _() int { } } // ERROR "missing return" - func _() int { print(1) switch x { @@ -673,7 +689,6 @@ func _() int { } } // ERROR "missing return" - func _() int { print(1) switch x.(type) { @@ -863,24 +878,28 @@ func _() int { func _() int { return 2 - {} + { + } } // ERROR "missing return" func _() int { L: goto L - {} + { + } } // ERROR "missing return" func _() int { panic(2) - {} + { + } } // ERROR "missing return" func _() int { { return 2 - {} + { + } } } // ERROR "missing return" @@ -888,14 +907,16 @@ func _() int { L: { goto L - {} + { + } } } // ERROR "missing return" func _() int { { panic(2) - {} + { + } } } // ERROR "missing return" @@ -903,7 +924,8 @@ func _() int { { return 2 } - {} + { + } } // ERROR "missing return" func _() int { @@ -911,14 +933,16 @@ L: { goto L } - {} + { + } } // ERROR "missing return" func _() int { { panic(2) } - {} + { + } } // ERROR "missing return" // if-else chain with final else and all terminating is okay @@ -980,11 +1004,11 @@ func _() int { } } // ERROR "missing return" - // for { loops that never break are okay. func _() int { - for {} + for { + } } func _() int { @@ -997,7 +1021,7 @@ func _() int { func _() int { for { - L: + L: for { break L } @@ -1007,7 +1031,9 @@ func _() int { // for { loops that break are not okay. func _() int { - for { break } + for { + break + } } // ERROR "missing return" func _() int { @@ -1030,7 +1056,8 @@ L: // if there's a condition - even "true" - the loops are no longer syntactically terminating func _() int { - for x == nil {} + for x == nil { + } } // ERROR "missing return" func _() int { @@ -1043,15 +1070,16 @@ func _() int { func _() int { for x == nil { - L: + L: for { break L } - } + } } // ERROR "missing return" func _() int { - for true {} + for true { + } } // ERROR "missing return" func _() int { @@ -1064,7 +1092,7 @@ func _() int { func _() int { for true { - L: + L: for { break L } @@ -1074,7 +1102,7 @@ func _() int { // select in which all cases terminate and none break are okay. func _() int { - select{} + select {} } func _() int { @@ -1089,7 +1117,8 @@ func _() int { select { case <-c: print(2) - for{} + for { + } } } @@ -1111,7 +1140,7 @@ func _() int { print(2) panic("abc") default: - select{} + select {} } } @@ -1136,7 +1165,6 @@ L: } } // ERROR "missing return" - func _() int { select { case <-c: @@ -1147,11 +1175,13 @@ func _() int { } } // ERROR "missing return" - // if any breaks refer to the select, the select isn't okay anymore, even if they're dead func _() int { - select{ default: break } + select { + default: + break + } } // ERROR "missing return" func _() int { @@ -1168,7 +1198,9 @@ L: select { case <-c: print(2) - for{ break L } + for { + break L + } } } // ERROR "missing return" @@ -1189,7 +1221,7 @@ func _() int { case <-c: panic("abc") default: - select{} + select {} break } } // ERROR "missing return" @@ -1233,7 +1265,6 @@ func _() int { } } // ERROR "missing return" - func _() int { switch x { case 1: @@ -1339,7 +1370,6 @@ func _() int { } } // ERROR "missing return" - func _() int { switch x.(type) { case int: @@ -1553,27 +1583,31 @@ var _ = func() int { var _ = func() int { print(1) return 2 - {} + { + } } // ERROR "missing return" var _ = func() int { L: print(1) goto L - {} + { + } } // ERROR "missing return" var _ = func() int { print(1) panic(2) - {} + { + } } // ERROR "missing return" var _ = func() int { { print(1) return 2 - {} + { + } } } // ERROR "missing return" @@ -1582,7 +1616,8 @@ L: { print(1) goto L - {} + { + } } } // ERROR "missing return" @@ -1590,7 +1625,8 @@ var _ = func() int { print(1) { panic(2) - {} + { + } } } // ERROR "missing return" @@ -1599,7 +1635,8 @@ var _ = func() int { print(1) return 2 } - {} + { + } } // ERROR "missing return" var _ = func() int { @@ -1608,7 +1645,8 @@ L: print(1) goto L } - {} + { + } } // ERROR "missing return" var _ = func() int { @@ -1616,7 +1654,8 @@ var _ = func() int { { panic(2) } - {} + { + } } // ERROR "missing return" // if-else chain with final else and all terminating is okay @@ -1684,12 +1723,12 @@ var _ = func() int { } } // ERROR "missing return" - // for { loops that never break are okay. var _ = func() int { print(1) - for {} + for { + } } var _ = func() int { @@ -1702,7 +1741,7 @@ var _ = func() int { var _ = func() int { for { - L: + L: for { break L } @@ -1713,7 +1752,9 @@ var _ = func() int { var _ = func() int { print(1) - for { break } + for { + break + } } // ERROR "missing return" var _ = func() int { @@ -1737,7 +1778,8 @@ L: var _ = func() int { print(1) - for x == nil {} + for x == nil { + } } // ERROR "missing return" var _ = func() int { @@ -1750,16 +1792,17 @@ var _ = func() int { var _ = func() int { for x == nil { - L: + L: for { break L } - } + } } // ERROR "missing return" var _ = func() int { print(1) - for true {} + for true { + } } // ERROR "missing return" var _ = func() int { @@ -1772,7 +1815,7 @@ var _ = func() int { var _ = func() int { for true { - L: + L: for { break L } @@ -1783,7 +1826,7 @@ var _ = func() int { var _ = func() int { print(1) - select{} + select {} } var _ = func() int { @@ -1800,7 +1843,8 @@ var _ = func() int { select { case <-c: print(2) - for{} + for { + } } } @@ -1824,7 +1868,7 @@ var _ = func() int { print(2) panic("abc") default: - select{} + select {} } } @@ -1851,7 +1895,6 @@ L: } } // ERROR "missing return" - var _ = func() int { print(1) select { @@ -1863,12 +1906,14 @@ var _ = func() int { } } // ERROR "missing return" - // if any breaks refer to the select, the select isn't okay anymore, even if they're dead var _ = func() int { print(1) - select{ default: break } + select { + default: + break + } } // ERROR "missing return" var _ = func() int { @@ -1887,7 +1932,9 @@ L: select { case <-c: print(2) - for{ break L } + for { + break L + } } } // ERROR "missing return" @@ -1911,7 +1958,7 @@ var _ = func() int { print(1) panic("abc") default: - select{} + select {} break } } // ERROR "missing return" @@ -1959,7 +2006,6 @@ var _ = func() int { } } // ERROR "missing return" - var _ = func() int { print(1) switch x { @@ -2075,7 +2121,6 @@ var _ = func() int { } } // ERROR "missing return" - var _ = func() int { print(1) switch x.(type) { @@ -2265,24 +2310,28 @@ var _ = func() int { var _ = func() int { return 2 - {} + { + } } // ERROR "missing return" var _ = func() int { L: goto L - {} + { + } } // ERROR "missing return" var _ = func() int { panic(2) - {} + { + } } // ERROR "missing return" var _ = func() int { { return 2 - {} + { + } } } // ERROR "missing return" @@ -2290,14 +2339,16 @@ var _ = func() int { L: { goto L - {} + { + } } } // ERROR "missing return" var _ = func() int { { panic(2) - {} + { + } } } // ERROR "missing return" @@ -2305,7 +2356,8 @@ var _ = func() int { { return 2 } - {} + { + } } // ERROR "missing return" var _ = func() int { @@ -2313,14 +2365,16 @@ L: { goto L } - {} + { + } } // ERROR "missing return" var _ = func() int { { panic(2) } - {} + { + } } // ERROR "missing return" // if-else chain with final else and all terminating is okay @@ -2382,11 +2436,11 @@ var _ = func() int { } } // ERROR "missing return" - // for { loops that never break are okay. var _ = func() int { - for {} + for { + } } var _ = func() int { @@ -2399,7 +2453,7 @@ var _ = func() int { var _ = func() int { for { - L: + L: for { break L } @@ -2409,7 +2463,9 @@ var _ = func() int { // for { loops that break are not okay. var _ = func() int { - for { break } + for { + break + } } // ERROR "missing return" var _ = func() int { @@ -2432,7 +2488,8 @@ L: // if there's a condition - even "true" - the loops are no longer syntactically terminating var _ = func() int { - for x == nil {} + for x == nil { + } } // ERROR "missing return" var _ = func() int { @@ -2445,15 +2502,16 @@ var _ = func() int { var _ = func() int { for x == nil { - L: + L: for { break L } - } + } } // ERROR "missing return" var _ = func() int { - for true {} + for true { + } } // ERROR "missing return" var _ = func() int { @@ -2466,7 +2524,7 @@ var _ = func() int { var _ = func() int { for true { - L: + L: for { break L } @@ -2476,7 +2534,7 @@ var _ = func() int { // select in which all cases terminate and none break are okay. var _ = func() int { - select{} + select {} } var _ = func() int { @@ -2491,7 +2549,8 @@ var _ = func() int { select { case <-c: print(2) - for{} + for { + } } } @@ -2513,7 +2572,7 @@ var _ = func() int { print(2) panic("abc") default: - select{} + select {} } } @@ -2538,7 +2597,6 @@ L: } } // ERROR "missing return" - var _ = func() int { select { case <-c: @@ -2549,11 +2607,13 @@ var _ = func() int { } } // ERROR "missing return" - // if any breaks refer to the select, the select isn't okay anymore, even if they're dead var _ = func() int { - select{ default: break } + select { + default: + break + } } // ERROR "missing return" var _ = func() int { @@ -2570,7 +2630,9 @@ L: select { case <-c: print(2) - for{ break L } + for { + break L + } } } // ERROR "missing return" @@ -2591,7 +2653,7 @@ var _ = func() int { case <-c: panic("abc") default: - select{} + select {} break } } // ERROR "missing return" @@ -2635,7 +2697,6 @@ var _ = func() int { } } // ERROR "missing return" - var _ = func() int { switch x { case 1: @@ -2741,7 +2802,6 @@ var _ = func() int { } } // ERROR "missing return" - var _ = func() int { switch x.(type) { case int: diff --git a/test/rune.go b/test/rune.go index 73a5aa23f820c..3509876910211 100644 --- a/test/rune.go +++ b/test/rune.go @@ -11,12 +11,12 @@ package rune var ( r0 = 'a' - r1 = 'a'+1 - r2 = 1+'a' - r3 = 'a'*2 - r4 = 'a'/2 - r5 = 'a'<<1 - r6 = 'b'<<2 + r1 = 'a' + 1 + r2 = 1 + 'a' + r3 = 'a' * 2 + r4 = 'a' / 2 + r5 = 'a' << 1 + r6 = 'b' << 2 r7 int32 r = []rune{r0, r1, r2, r3, r4, r5, r6, r7} @@ -24,15 +24,15 @@ var ( var ( f0 = 1.2 - f1 = 1.2/'a' + f1 = 1.2 / 'a' f = []float64{f0, f1} ) var ( i0 = 1 - i1 = 1<<'\x01' - + i1 = 1 << '\x01' + i = []int{i0, i1} ) @@ -42,6 +42,6 @@ const ( var ( b0 = maxRune < r0 - + b = []bool{b0} ) diff --git a/test/runtime.go b/test/runtime.go index 0cf781b814bda..09862acf502cc 100644 --- a/test/runtime.go +++ b/test/runtime.go @@ -17,5 +17,5 @@ package main import "runtime" func main() { - runtime.printbool(true) // ERROR "unexported" "undefined" + runtime.printbool(true) // ERROR "unexported" "undefined" } diff --git a/test/safe/main.go b/test/safe/main.go index d173ed9266395..8c2e6e6ef5cce 100644 --- a/test/safe/main.go +++ b/test/safe/main.go @@ -7,7 +7,7 @@ package main // can't use local path with -u, use -I. instead -import "pkg" // ERROR "import unsafe package" +import "pkg" // ERROR "import unsafe package" func main() { print(pkg.Float32bits(1.0)) diff --git a/test/safe/pkg.go b/test/safe/pkg.go index bebc43a214cb3..e08f93ee52815 100644 --- a/test/safe/pkg.go +++ b/test/safe/pkg.go @@ -13,4 +13,4 @@ import "unsafe" // this should be inlinable func Float32bits(f float32) uint32 { return *(*uint32)(unsafe.Pointer(&f)) -} \ No newline at end of file +} diff --git a/test/shift1.go b/test/shift1.go index 01ecbed53a0b5..dd990fa92928a 100644 --- a/test/shift1.go +++ b/test/shift1.go @@ -61,12 +61,12 @@ func _() { o = 1<