Merge pull request #291 from xushiwei/q

go1.18
goplus · Oct 20, 2023 · 7a7af25 · 7a7af25
2 parents dc69970 + f88b88f
commit 7a7af25
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 158 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -10,7 +10,7 @@ jobs:
   Test:
     strategy:
       matrix:
-        go-version: [1.16.x, 1.18.x, 1.21.x]
+        go-version: [1.18.x, 1.21.x]
         os: [ubuntu-latest, windows-latest, macos-11]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/codebuild.go b/codebuild.go
@@ -1149,7 +1149,7 @@ func (p *CodeBuilder) Index(nidx int, twoValue bool, src ...ast.Node) *CodeBuild
 		log.Println("Index", nidx, twoValue)
 	}
 	args := p.stk.GetArgs(nidx + 1)
-	if enableTypeParams {
+	if enableTypeParams && nidx > 0 {
 		if _, ok := args[1].Type.(*TypeType); ok {
 			return p.inferType(nidx, args, src...)
 		}

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/goplus/gox
 
-go 1.16
+go 1.18
 
 require golang.org/x/tools v0.14.0
 

diff --git a/types_go118.go → typeparams.go b/types_go118.go → typeparams.go
@@ -1,6 +1,3 @@
-//go:build go1.18
-// +build go1.18
-
 /*
  Copyright 2022 The GoPlus Authors (goplus.org)
  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/types_go117.go b/types_go117.go