mewin/cppdap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup + kokoro ubuntu fix (#86)

Browse Source 
* tools: Minor clean up of protocol_gen.go

* Fix kokoro/ubuntu builds
This commit is contained in:
Ben Clayton 2022-12-16 13:53:50 +00:00 committed by GitHub
parent 87f8b4a06b
commit 8a320f56dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kokoro/ubuntu/presubmit-docker.sh
View File

@ -22,6 +22,9 @@ set -x # Display commands being run.
cd github/cppdap cd github/cppdap
# Silence "fatal: unsafe repository" errors
git config --global --add safe.directory '*'
git submodule update --init git submodule update --init
if [ "$BUILD_SYSTEM" == "cmake" ]; then if [ "$BUILD_SYSTEM" == "cmake" ]; then

15
tools/protocol_gen/protocol_gen.go
View File

@ -488,19 +488,18 @@ func (r *root) getType(def *definition) (builtType cppType, err error) {
} }
if len(def.OneOf) != 0 { if len(def.OneOf) != 0 {
args := []string{} args := make([]string, len(def.OneOf))
deps := []cppType{} deps := make([]cppType, len(def.OneOf))
for i := 0; i < len(def.OneOf); i++ { for i, oneOf := range def.OneOf {
if def.OneOf[i] == nil { if oneOf == nil {
return nil, fmt.Errorf("Item %d in oneOf is nil", i) return nil, fmt.Errorf("Item %d in oneOf is nil", i)
} }
elTy, err := r.getType(oneOf)
elTy, err := r.getType(def.OneOf[i])
if err != nil { if err != nil {
return nil, err return nil, err
} }
deps = append(deps, elTy) deps[i] = elTy
args = append(args, elTy.Name()) args[i] = elTy.Name()
} }
return &cppBasicType{ return &cppBasicType{
name: "variant<" + strings.Join(args, ", ") + ">", name: "variant<" + strings.Join(args, ", ") + ">",