Merge pull request #122 from myitcv/fix_120

cmd/reactGen: fix clash in receiver and parameter name in generated props

Author: myitcv

_scripts/run_tests.sh

@@ -83,8 +83,11 @@ immutableVet ./...
 # we need to explicitly test the generated test files
 go test myitcv.io/react/cmd/stateGen/_testFiles/
 
-# off the back of https://github.com/myitcv/react/issues/116#issuecomment-380280847
-# ensure that we can go get myitcv.io/react/... in a totally clean environment
-cd `mktemp -d`
-export GOPATH=$PWD
-go get myitcv.io/react/...
+if [ "${CI:-}" == "true" ]
+then
+	# off the back of https://github.com/myitcv/react/issues/116#issuecomment-380280847
+	# ensure that we can go get myitcv.io/react/... in a totally clean environment
+	cd `mktemp -d`
+	export GOPATH=$PWD
+	go get myitcv.io/react/...
+fi

cmd/reactGen/props_gen.go

@@ -100,40 +100,40 @@ func (g *gen) genProps(defName string, t typeFile) {
 	{{- end}}
 	}
 
-	func ({{$recv}} *{{.Name}}) assign(v *_{{.Name}}) {
+	func ({{$recv}} *{{.Name}}) assign(_v *_{{.Name}}) {
 		{{- range .Fields}}
 			{{ if eq .TName "Ref" }}
 			if {{$recv}}.Ref != nil {
-				v.o.Set("ref", {{$recv}}.Ref.Ref)
+				_v.o.Set("ref", {{$recv}}.Ref.Ref)
 			}
 			{{ else if eq .TName "DataSet" }}
 			if {{$recv}}.DataSet != nil {
 				for dk, dv := range {{$recv}}.DataSet {
-					v.o.Set("data-"+dk, dv)
+					_v.o.Set("data-"+dk, dv)
 				}
 			}
 			{{ else if eq .TName "AriaSet" }}
 			if {{$recv}}.AriaSet != nil {
 				for dk, dv := range {{$recv}}.AriaSet {
-					v.o.Set("aria-"+dk, dv)
+					_v.o.Set("aria-"+dk, dv)
 				}
 			}
 			{{else}}
 			{{ if .Omit }}
 				if {{$recv}}.{{.TName}} != "" {
-					v.{{.TName}} = {{$recv}}.{{.TName}}
+					_v.{{.TName}} = {{$recv}}.{{.TName}}
 				}
 			{{else}}
 			{{if .IsEvent}}
 				if {{$recv}}.{{.TName}} != nil {
-					v.o.Set("{{.FName}}", {{$recv}}.{{.TName}}.{{.TName}})
+					_v.o.Set("{{.FName}}", {{$recv}}.{{.TName}}.{{.TName}})
 				}
 			{{else if eq .Name "Style"}}
 				// TODO: until we have a resolution on
 				// https://github.com/gopherjs/gopherjs/issues/236
-				v.{{.TName}} = {{$recv}}.{{.TName}}.hack()
+				_v.{{.TName}} = {{$recv}}.{{.TName}}.hack()
 			{{else}}
-				v.{{.TName}} = {{$recv}}.{{.TName}}
+				_v.{{.TName}} = {{$recv}}.{{.TName}}
 			{{end}}
 			{{end}}
 			{{end}}