diff --git a/CMakeLists.txt b/CMakeLists.txt index 63bac9a225..204f8a3488 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ build_subdirectory(cmd) build_subdirectory(core) build_subdirectory(gapii) +build_subdirectory(gapil) build_subdirectory(gapir) build_subdirectory(gapis) build_subdirectory(gapidapk) @@ -78,7 +79,7 @@ include_directories(${CMAKE_SOURCE_DIR}) # generation steps. # Might have to add an explicit dependancy on codergen-all to fix it. codergen( - core/gapil/snippets + gapil/snippets framework/binary/any framework/binary/test gapis/atom diff --git a/CMakeProto.cmake b/CMakeProto.cmake index 427173cc2d..edf2a0c8b5 100644 --- a/CMakeProto.cmake +++ b/CMakeProto.cmake @@ -19,8 +19,8 @@ protoc_go("github.com/google/gapid/core/data/record" "core/data/record" "record. protoc_go("github.com/google/gapid/core/data/search" "core/data/search" "search.proto") protoc_go("github.com/google/gapid/core/data/stash/grpc" "core/data/stash/grpc" "stash.proto") protoc_go("github.com/google/gapid/core/data/stash" "core/data/stash" "stash.proto") -protoc_go("github.com/google/gapid/core/gapil/snippets" "core/gapil/snippets" "snippets.proto") -protoc_java("core/gapil/snippets" "snippets.proto" "com/google/gapid/proto/service/snippets/SnippetsProtos") +protoc_go("github.com/google/gapid/gapil/snippets" "gapil/snippets" "snippets.proto") +protoc_java("gapil/snippets" "snippets.proto" "com/google/gapid/proto/service/snippets/SnippetsProtos") protoc_go("github.com/google/gapid/core/image" "core/image" "image.proto") protoc_java("core/image" "image.proto" "com/google/gapid/proto/image/Image") protoc_go("github.com/google/gapid/core/os/android/apk" "core/os/android/apk" "apk.proto") diff --git a/cmd/annotate/main.go b/cmd/annotate/main.go index 8ea8028b1f..80a5d3e389 100644 --- a/cmd/annotate/main.go +++ b/cmd/annotate/main.go @@ -22,9 +22,9 @@ import ( "github.com/google/gapid/core/app" "github.com/google/gapid/core/fault/cause" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/annotate" "github.com/google/gapid/core/log" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/annotate" ) const maxErrors = 10 diff --git a/cmd/apic/format.go b/cmd/apic/format.go index 72f5240ac2..605d7dde96 100644 --- a/cmd/apic/format.go +++ b/cmd/apic/format.go @@ -25,10 +25,10 @@ import ( "github.com/google/gapid/core/app" "github.com/google/gapid/core/context/jot" - "github.com/google/gapid/core/gapil/format" - "github.com/google/gapid/core/gapil/parser" "github.com/google/gapid/core/log" "github.com/google/gapid/core/text/parse" + "github.com/google/gapid/gapil/format" + "github.com/google/gapid/gapil/parser" ) func init() { diff --git a/cmd/apic/template.go b/cmd/apic/template.go index 55b52116b9..796ef47d68 100644 --- a/cmd/apic/template.go +++ b/cmd/apic/template.go @@ -24,9 +24,9 @@ import ( "github.com/google/gapid/core/app" "github.com/google/gapid/core/app/flags" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/template" "github.com/google/gapid/core/log" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/template" ) var ( diff --git a/cmd/apic/validate.go b/cmd/apic/validate.go index 5e08bc141c..d281f6d25f 100644 --- a/cmd/apic/validate.go +++ b/cmd/apic/validate.go @@ -24,9 +24,9 @@ import ( "os" "github.com/google/gapid/core/app" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/validate" "github.com/google/gapid/core/log" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/validate" ) func init() { diff --git a/cmd/verify_gles_api/main.go b/cmd/verify_gles_api/main.go index 28f61e47b8..184c47ef43 100644 --- a/cmd/verify_gles_api/main.go +++ b/cmd/verify_gles_api/main.go @@ -23,11 +23,11 @@ import ( "strings" "github.com/google/gapid/core/app" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" "github.com/google/gapid/core/log" "github.com/google/gapid/core/text/parse" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" ) var ( diff --git a/core/CMakeBuild.cmake b/core/CMakeBuild.cmake index cca20daa1e..b5904ed9f5 100644 --- a/core/CMakeBuild.cmake +++ b/core/CMakeBuild.cmake @@ -14,7 +14,6 @@ build_subdirectory(cc) build_subdirectory(data) -build_subdirectory(gapil) build_subdirectory(os) build_subdirectory(text) build_subdirectory(vulkan) diff --git a/core/langsvr/uri.go b/core/langsvr/uri.go index d6d70d6a4b..706499ec1b 100644 --- a/core/langsvr/uri.go +++ b/core/langsvr/uri.go @@ -34,5 +34,5 @@ func URItoPath(uri string) (string, error) { // PathToURI returns the URI for the absolute filepath func PathToURI(path string) string { - return "file://" + path + return "file://" + filepath.ToSlash(path) } diff --git a/core/gapil/CMakeBuild.cmake b/gapil/CMakeBuild.cmake similarity index 100% rename from core/gapil/CMakeBuild.cmake rename to gapil/CMakeBuild.cmake diff --git a/core/gapil/CMakeFiles.cmake b/gapil/CMakeFiles.cmake similarity index 100% rename from core/gapil/CMakeFiles.cmake rename to gapil/CMakeFiles.cmake diff --git a/core/gapil/analysis/CMakeFiles.cmake b/gapil/analysis/CMakeFiles.cmake similarity index 100% rename from core/gapil/analysis/CMakeFiles.cmake rename to gapil/analysis/CMakeFiles.cmake diff --git a/core/gapil/analysis/analysis.go b/gapil/analysis/analysis.go similarity index 100% rename from core/gapil/analysis/analysis.go rename to gapil/analysis/analysis.go diff --git a/core/gapil/analysis/analyze.go b/gapil/analysis/analyze.go similarity index 98% rename from core/gapil/analysis/analyze.go rename to gapil/analysis/analyze.go index 7cbdb1eef7..9eb2075886 100644 --- a/core/gapil/analysis/analyze.go +++ b/gapil/analysis/analyze.go @@ -15,9 +15,9 @@ package analysis import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" ) const maxPasses = 3 diff --git a/core/gapil/analysis/analyze_test.go b/gapil/analysis/analyze_test.go similarity index 96% rename from core/gapil/analysis/analyze_test.go rename to gapil/analysis/analyze_test.go index 5158772bfa..1ed284d1bd 100644 --- a/core/gapil/analysis/analyze_test.go +++ b/gapil/analysis/analyze_test.go @@ -19,12 +19,12 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/analysis" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/parser" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/analysis" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/parser" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/log" "github.com/google/gapid/core/math/interval" ) diff --git a/core/gapil/analysis/bool_value.go b/gapil/analysis/bool_value.go similarity index 98% rename from core/gapil/analysis/bool_value.go rename to gapil/analysis/bool_value.go index ff373317d2..14a7a3ef55 100644 --- a/core/gapil/analysis/bool_value.go +++ b/gapil/analysis/bool_value.go @@ -14,7 +14,7 @@ package analysis -import "github.com/google/gapid/core/gapil/semantic" +import "github.com/google/gapid/gapil/semantic" // Value interface compliance check. var _ = Value(&BoolValue{}) diff --git a/core/gapil/analysis/class_value.go b/gapil/analysis/class_value.go similarity index 98% rename from core/gapil/analysis/class_value.go rename to gapil/analysis/class_value.go index e5ad480ed8..47c7e61652 100644 --- a/core/gapil/analysis/class_value.go +++ b/gapil/analysis/class_value.go @@ -19,7 +19,7 @@ import ( "sort" "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) // Value interface compliance checks. diff --git a/core/gapil/analysis/class_value_test.go b/gapil/analysis/class_value_test.go similarity index 95% rename from core/gapil/analysis/class_value_test.go rename to gapil/analysis/class_value_test.go index 519cb7e21c..a1950ce560 100644 --- a/core/gapil/analysis/class_value_test.go +++ b/gapil/analysis/class_value_test.go @@ -18,8 +18,8 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/analysis" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/analysis" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/log" ) diff --git a/core/gapil/analysis/enum_value.go b/gapil/analysis/enum_value.go similarity index 99% rename from core/gapil/analysis/enum_value.go rename to gapil/analysis/enum_value.go index af12cfd3a9..4673b54dfc 100644 --- a/core/gapil/analysis/enum_value.go +++ b/gapil/analysis/enum_value.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) // Value interface compliance checks. diff --git a/core/gapil/analysis/expressions.go b/gapil/analysis/expressions.go similarity index 97% rename from core/gapil/analysis/expressions.go rename to gapil/analysis/expressions.go index 997921663f..62e443f73b 100644 --- a/core/gapil/analysis/expressions.go +++ b/gapil/analysis/expressions.go @@ -15,8 +15,8 @@ package analysis import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) // equal returns the semantic expression: (lhs == rhs) diff --git a/core/gapil/analysis/map_value.go b/gapil/analysis/map_value.go similarity index 99% rename from core/gapil/analysis/map_value.go rename to gapil/analysis/map_value.go index 14b7573ef0..0725809625 100644 --- a/core/gapil/analysis/map_value.go +++ b/gapil/analysis/map_value.go @@ -19,7 +19,7 @@ import ( "sort" "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) // Value interface compliance check. diff --git a/core/gapil/analysis/map_value_test.go b/gapil/analysis/map_value_test.go similarity index 98% rename from core/gapil/analysis/map_value_test.go rename to gapil/analysis/map_value_test.go index 64675d8ebf..bb2c608465 100644 --- a/core/gapil/analysis/map_value_test.go +++ b/gapil/analysis/map_value_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/analysis" + "github.com/google/gapid/gapil/analysis" "github.com/google/gapid/core/log" ) diff --git a/core/gapil/analysis/possibility.go b/gapil/analysis/possibility.go similarity index 100% rename from core/gapil/analysis/possibility.go rename to gapil/analysis/possibility.go diff --git a/core/gapil/analysis/possibility_test.go b/gapil/analysis/possibility_test.go similarity index 98% rename from core/gapil/analysis/possibility_test.go rename to gapil/analysis/possibility_test.go index 78ec6ed7fe..c61fccebdd 100644 --- a/core/gapil/analysis/possibility_test.go +++ b/gapil/analysis/possibility_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/analysis" + "github.com/google/gapid/gapil/analysis" ) var ( diff --git a/core/gapil/analysis/reference_value.go b/gapil/analysis/reference_value.go similarity index 99% rename from core/gapil/analysis/reference_value.go rename to gapil/analysis/reference_value.go index 6877e74cd5..3582a253b6 100644 --- a/core/gapil/analysis/reference_value.go +++ b/gapil/analysis/reference_value.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) // Value interface compliance checks. diff --git a/core/gapil/analysis/reference_value_test.go b/gapil/analysis/reference_value_test.go similarity index 97% rename from core/gapil/analysis/reference_value_test.go rename to gapil/analysis/reference_value_test.go index 8ebca21231..9f354d2f3c 100644 --- a/core/gapil/analysis/reference_value_test.go +++ b/gapil/analysis/reference_value_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/analysis" + "github.com/google/gapid/gapil/analysis" "github.com/google/gapid/core/log" ) diff --git a/core/gapil/analysis/results.go b/gapil/analysis/results.go similarity index 98% rename from core/gapil/analysis/results.go rename to gapil/analysis/results.go index 92fc1c78b2..a0e0e5808c 100644 --- a/core/gapil/analysis/results.go +++ b/gapil/analysis/results.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/analysis/scope.go b/gapil/analysis/scope.go similarity index 96% rename from core/gapil/analysis/scope.go rename to gapil/analysis/scope.go index 4ed566bb28..5604c0b108 100644 --- a/core/gapil/analysis/scope.go +++ b/gapil/analysis/scope.go @@ -15,9 +15,9 @@ package analysis import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" ) // scope contains the full context information for analysis of a semantic node. diff --git a/core/gapil/analysis/uint_value.go b/gapil/analysis/uint_value.go similarity index 99% rename from core/gapil/analysis/uint_value.go rename to gapil/analysis/uint_value.go index 572733058e..1f5a4f5317 100644 --- a/core/gapil/analysis/uint_value.go +++ b/gapil/analysis/uint_value.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/math/interval" "github.com/google/gapid/core/math/u64" ) diff --git a/core/gapil/analysis/uint_value_test.go b/gapil/analysis/uint_value_test.go similarity index 98% rename from core/gapil/analysis/uint_value_test.go rename to gapil/analysis/uint_value_test.go index d9e8de8e60..acdc63b1ab 100644 --- a/core/gapil/analysis/uint_value_test.go +++ b/gapil/analysis/uint_value_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/analysis" + "github.com/google/gapid/gapil/analysis" ) func TestU32ValueEquals(t *testing.T) { diff --git a/core/gapil/analysis/unreachables.go b/gapil/analysis/unreachables.go similarity index 94% rename from core/gapil/analysis/unreachables.go rename to gapil/analysis/unreachables.go index 381a8fb18e..33d0712d3d 100644 --- a/core/gapil/analysis/unreachables.go +++ b/gapil/analysis/unreachables.go @@ -15,9 +15,9 @@ package analysis import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" ) // findUnreachables returns the list of blocks and statements that are found diff --git a/core/gapil/analysis/untracked_value.go b/gapil/analysis/untracked_value.go similarity index 98% rename from core/gapil/analysis/untracked_value.go rename to gapil/analysis/untracked_value.go index 05ac9196c5..1e595c8388 100644 --- a/core/gapil/analysis/untracked_value.go +++ b/gapil/analysis/untracked_value.go @@ -17,7 +17,7 @@ package analysis import ( "fmt" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) // Value interface compliance checks. diff --git a/core/gapil/analysis/value.go b/gapil/analysis/value.go similarity index 99% rename from core/gapil/analysis/value.go rename to gapil/analysis/value.go index bb6c0e4ca2..e1e95ad25d 100644 --- a/core/gapil/analysis/value.go +++ b/gapil/analysis/value.go @@ -18,8 +18,8 @@ import ( "fmt" "reflect" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) // Value represents the data flow analysis representation of a variable or diff --git a/core/gapil/annotate/CMakeFiles.cmake b/gapil/annotate/CMakeFiles.cmake similarity index 100% rename from core/gapil/annotate/CMakeFiles.cmake rename to gapil/annotate/CMakeFiles.cmake diff --git a/core/gapil/annotate/annotate.go b/gapil/annotate/annotate.go similarity index 99% rename from core/gapil/annotate/annotate.go rename to gapil/annotate/annotate.go index a139ce3f27..4ad60aa2f9 100644 --- a/core/gapil/annotate/annotate.go +++ b/gapil/annotate/annotate.go @@ -17,8 +17,8 @@ package annotate import ( "fmt" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/snippets" ) // nodeString returns a textual representation of a semantic node. If the diff --git a/core/gapil/annotate/container.go b/gapil/annotate/container.go similarity index 98% rename from core/gapil/annotate/container.go rename to gapil/annotate/container.go index f436f91e3e..0d58b2f645 100644 --- a/core/gapil/annotate/container.go +++ b/gapil/annotate/container.go @@ -17,7 +17,7 @@ package annotate import ( "fmt" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/snippets" ) // container represents the nested structure of a container type such diff --git a/core/gapil/annotate/doc.go b/gapil/annotate/doc.go similarity index 100% rename from core/gapil/annotate/doc.go rename to gapil/annotate/doc.go diff --git a/core/gapil/annotate/entity.go b/gapil/annotate/entity.go similarity index 97% rename from core/gapil/annotate/entity.go rename to gapil/annotate/entity.go index 6d4cc92e8b..127479a42e 100644 --- a/core/gapil/annotate/entity.go +++ b/gapil/annotate/entity.go @@ -19,8 +19,8 @@ import ( "fmt" "sort" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/snippets" ) type entity struct { diff --git a/core/gapil/annotate/location.go b/gapil/annotate/location.go similarity index 98% rename from core/gapil/annotate/location.go rename to gapil/annotate/location.go index c797fbd868..ea60248e84 100644 --- a/core/gapil/annotate/location.go +++ b/gapil/annotate/location.go @@ -18,8 +18,8 @@ import ( "bytes" "fmt" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/snippets" ) // Location is a static representation of an assignable location in the diff --git a/core/gapil/annotate/nested.go b/gapil/annotate/nested.go similarity index 98% rename from core/gapil/annotate/nested.go rename to gapil/annotate/nested.go index 00f868032b..f35bdc0a70 100644 --- a/core/gapil/annotate/nested.go +++ b/gapil/annotate/nested.go @@ -18,7 +18,7 @@ import ( "bytes" "fmt" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/snippets" ) // Nested is an interface which is provided by any type structure where diff --git a/core/gapil/annotate/path.go b/gapil/annotate/path.go similarity index 96% rename from core/gapil/annotate/path.go rename to gapil/annotate/path.go index 20627e95a3..770fbc409e 100644 --- a/core/gapil/annotate/path.go +++ b/gapil/annotate/path.go @@ -17,8 +17,8 @@ package annotate import ( "fmt" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/snippets" ) // path returns a Pathway for the given stmt. If hasPath(stmt) is diff --git a/core/gapil/annotate/pointer.go b/gapil/annotate/pointer.go similarity index 98% rename from core/gapil/annotate/pointer.go rename to gapil/annotate/pointer.go index e0a47a0b59..d286e7ddd2 100644 --- a/core/gapil/annotate/pointer.go +++ b/gapil/annotate/pointer.go @@ -17,7 +17,7 @@ package annotate import ( "fmt" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/snippets" ) // pointer represents the nested structure of a pointer type. In the API diff --git a/core/gapil/annotate/snippets.go b/gapil/annotate/snippets.go similarity index 94% rename from core/gapil/annotate/snippets.go rename to gapil/annotate/snippets.go index 87149ada89..96e3590072 100644 --- a/core/gapil/annotate/snippets.go +++ b/gapil/annotate/snippets.go @@ -14,7 +14,7 @@ package annotate -import "github.com/google/gapid/core/gapil/snippets" +import "github.com/google/gapid/gapil/snippets" // newObservation returns a new leader location associated with an observation func newObservation(ot snippets.ObservationType) *Location { diff --git a/core/gapil/annotate/symbol.go b/gapil/annotate/symbol.go similarity index 97% rename from core/gapil/annotate/symbol.go rename to gapil/annotate/symbol.go index e6eb4dc531..14891ff2d2 100644 --- a/core/gapil/annotate/symbol.go +++ b/gapil/annotate/symbol.go @@ -18,8 +18,8 @@ import ( "bytes" "fmt" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/snippets" ) func category(expr semantic.Expression) snippets.SymbolCategory { diff --git a/core/gapil/annotate/verb.go b/gapil/annotate/verb.go similarity index 97% rename from core/gapil/annotate/verb.go rename to gapil/annotate/verb.go index c2f6b620f8..7687bf2662 100644 --- a/core/gapil/annotate/verb.go +++ b/gapil/annotate/verb.go @@ -20,9 +20,9 @@ import ( "io" "sort" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/semantic/printer" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/semantic/printer" + "github.com/google/gapid/gapil/snippets" "github.com/google/gapid/framework/binary/cyclic" "github.com/google/gapid/framework/binary/vle" ) diff --git a/core/gapil/api.go b/gapil/api.go similarity index 97% rename from core/gapil/api.go rename to gapil/api.go index c4114d2532..e4d9cbfb9f 100644 --- a/core/gapil/api.go +++ b/gapil/api.go @@ -25,10 +25,10 @@ import ( "sort" "sync" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/parser" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/parser" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/ast/CMakeFiles.cmake b/gapil/ast/CMakeFiles.cmake similarity index 100% rename from core/gapil/ast/CMakeFiles.cmake rename to gapil/ast/CMakeFiles.cmake diff --git a/core/gapil/ast/api.go b/gapil/ast/api.go similarity index 100% rename from core/gapil/ast/api.go rename to gapil/ast/api.go diff --git a/core/gapil/ast/expression.go b/gapil/ast/expression.go similarity index 100% rename from core/gapil/ast/expression.go rename to gapil/ast/expression.go diff --git a/core/gapil/ast/function.go b/gapil/ast/function.go similarity index 100% rename from core/gapil/ast/function.go rename to gapil/ast/function.go diff --git a/core/gapil/ast/identifier.go b/gapil/ast/identifier.go similarity index 100% rename from core/gapil/ast/identifier.go rename to gapil/ast/identifier.go diff --git a/core/gapil/ast/invalid.go b/gapil/ast/invalid.go similarity index 100% rename from core/gapil/ast/invalid.go rename to gapil/ast/invalid.go diff --git a/core/gapil/ast/literal.go b/gapil/ast/literal.go similarity index 100% rename from core/gapil/ast/literal.go rename to gapil/ast/literal.go diff --git a/core/gapil/ast/node.go b/gapil/ast/node.go similarity index 100% rename from core/gapil/ast/node.go rename to gapil/ast/node.go diff --git a/core/gapil/ast/operator.go b/gapil/ast/operator.go similarity index 100% rename from core/gapil/ast/operator.go rename to gapil/ast/operator.go diff --git a/core/gapil/ast/type.go b/gapil/ast/type.go similarity index 100% rename from core/gapil/ast/type.go rename to gapil/ast/type.go diff --git a/core/gapil/ast/visit.go b/gapil/ast/visit.go similarity index 100% rename from core/gapil/ast/visit.go rename to gapil/ast/visit.go diff --git a/core/gapil/format/CMakeFiles.cmake b/gapil/format/CMakeFiles.cmake similarity index 100% rename from core/gapil/format/CMakeFiles.cmake rename to gapil/format/CMakeFiles.cmake diff --git a/core/gapil/format/format.go b/gapil/format/format.go similarity index 99% rename from core/gapil/format/format.go rename to gapil/format/format.go index 01208270b6..674c41b53d 100644 --- a/core/gapil/format/format.go +++ b/gapil/format/format.go @@ -23,8 +23,8 @@ import ( "strings" "text/tabwriter" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/parser" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/parser" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/format/indenter.go b/gapil/format/indenter.go similarity index 100% rename from core/gapil/format/indenter.go rename to gapil/format/indenter.go diff --git a/core/gapil/format/ws_trimmer.go b/gapil/format/ws_trimmer.go similarity index 100% rename from core/gapil/format/ws_trimmer.go rename to gapil/format/ws_trimmer.go diff --git a/core/gapil/fuzz/.gitignore b/gapil/fuzz/.gitignore similarity index 100% rename from core/gapil/fuzz/.gitignore rename to gapil/fuzz/.gitignore diff --git a/core/gapil/fuzz/corpus/binaryop.api b/gapil/fuzz/corpus/binaryop.api similarity index 100% rename from core/gapil/fuzz/corpus/binaryop.api rename to gapil/fuzz/corpus/binaryop.api diff --git a/core/gapil/fuzz/corpus/bitfield.api b/gapil/fuzz/corpus/bitfield.api similarity index 100% rename from core/gapil/fuzz/corpus/bitfield.api rename to gapil/fuzz/corpus/bitfield.api diff --git a/core/gapil/fuzz/corpus/cast.api b/gapil/fuzz/corpus/cast.api similarity index 100% rename from core/gapil/fuzz/corpus/cast.api rename to gapil/fuzz/corpus/cast.api diff --git a/core/gapil/fuzz/corpus/class.api b/gapil/fuzz/corpus/class.api similarity index 100% rename from core/gapil/fuzz/corpus/class.api rename to gapil/fuzz/corpus/class.api diff --git a/core/gapil/fuzz/corpus/cmd.api b/gapil/fuzz/corpus/cmd.api similarity index 100% rename from core/gapil/fuzz/corpus/cmd.api rename to gapil/fuzz/corpus/cmd.api diff --git a/core/gapil/fuzz/corpus/empty.api b/gapil/fuzz/corpus/empty.api similarity index 100% rename from core/gapil/fuzz/corpus/empty.api rename to gapil/fuzz/corpus/empty.api diff --git a/core/gapil/fuzz/corpus/enum.api b/gapil/fuzz/corpus/enum.api similarity index 100% rename from core/gapil/fuzz/corpus/enum.api rename to gapil/fuzz/corpus/enum.api diff --git a/core/gapil/fuzz/corpus/fence.api b/gapil/fuzz/corpus/fence.api similarity index 100% rename from core/gapil/fuzz/corpus/fence.api rename to gapil/fuzz/corpus/fence.api diff --git a/core/gapil/fuzz/corpus/globals.api b/gapil/fuzz/corpus/globals.api similarity index 100% rename from core/gapil/fuzz/corpus/globals.api rename to gapil/fuzz/corpus/globals.api diff --git a/core/gapil/fuzz/corpus/new.api b/gapil/fuzz/corpus/new.api similarity index 100% rename from core/gapil/fuzz/corpus/new.api rename to gapil/fuzz/corpus/new.api diff --git a/core/gapil/fuzz/corpus/new_ref.api b/gapil/fuzz/corpus/new_ref.api similarity index 100% rename from core/gapil/fuzz/corpus/new_ref.api rename to gapil/fuzz/corpus/new_ref.api diff --git a/core/gapil/fuzz/corpus/sub.api b/gapil/fuzz/corpus/sub.api similarity index 100% rename from core/gapil/fuzz/corpus/sub.api rename to gapil/fuzz/corpus/sub.api diff --git a/core/gapil/fuzz/corpus/type.api b/gapil/fuzz/corpus/type.api similarity index 100% rename from core/gapil/fuzz/corpus/type.api rename to gapil/fuzz/corpus/type.api diff --git a/core/gapil/fuzz/fuzz b/gapil/fuzz/fuzz similarity index 78% rename from core/gapil/fuzz/fuzz rename to gapil/fuzz/fuzz index e2f4eeb5e1..4fb06c4725 100755 --- a/core/gapil/fuzz/fuzz +++ b/gapil/fuzz/fuzz @@ -1,6 +1,6 @@ go get github.com/dvyukov/go-fuzz/go-fuzz go get github.com/dvyukov/go-fuzz/go-fuzz-build -go-fuzz-build github.com/google/gapid/core/gapil/fuzz +go-fuzz-build github.com/google/gapid/gapil/fuzz mkdir -p ./fuzz-wd/corpus cp -r ./corpus/* ./fuzz-wd/corpus diff --git a/core/gapil/fuzz/fuzz.go b/gapil/fuzz/fuzz.go similarity index 94% rename from core/gapil/fuzz/fuzz.go rename to gapil/fuzz/fuzz.go index d4a5cc17ea..a2c7b957c6 100644 --- a/core/gapil/fuzz/fuzz.go +++ b/gapil/fuzz/fuzz.go @@ -20,8 +20,8 @@ package fuzz import ( - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/resolver" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/resolver" ) func compile(data []byte) bool { diff --git a/core/gapil/fuzz/fuzz_test.go b/gapil/fuzz/fuzz_test.go similarity index 96% rename from core/gapil/fuzz/fuzz_test.go rename to gapil/fuzz/fuzz_test.go index 3852f670ab..88a58e3984 100644 --- a/core/gapil/fuzz/fuzz_test.go +++ b/gapil/fuzz/fuzz_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/resolver" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/resolver" "github.com/google/gapid/core/log" ) diff --git a/core/gapil/langsvr/CMakeBuild.cmake b/gapil/langsvr/CMakeBuild.cmake similarity index 100% rename from core/gapil/langsvr/CMakeBuild.cmake rename to gapil/langsvr/CMakeBuild.cmake diff --git a/core/gapil/langsvr/CMakeFiles.cmake b/gapil/langsvr/CMakeFiles.cmake similarity index 100% rename from core/gapil/langsvr/CMakeFiles.cmake rename to gapil/langsvr/CMakeFiles.cmake diff --git a/core/gapil/langsvr/analyze.go b/gapil/langsvr/analyze.go similarity index 97% rename from core/gapil/langsvr/analyze.go rename to gapil/langsvr/analyze.go index bfd981e734..84d1fcaa50 100644 --- a/core/gapil/langsvr/analyze.go +++ b/gapil/langsvr/analyze.go @@ -24,12 +24,12 @@ import ( "github.com/google/gapid/core/event/task" "github.com/google/gapid/core/fault/cause" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/analysis" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/validate" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/analysis" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/validate" ls "github.com/google/gapid/core/langsvr" "github.com/google/gapid/core/log" "github.com/google/gapid/core/text/parse" diff --git a/core/gapil/langsvr/debug_logger.go b/gapil/langsvr/debug_logger.go similarity index 100% rename from core/gapil/langsvr/debug_logger.go rename to gapil/langsvr/debug_logger.go diff --git a/core/gapil/langsvr/main.go b/gapil/langsvr/main.go similarity index 98% rename from core/gapil/langsvr/main.go rename to gapil/langsvr/main.go index 3004064392..59715c51b2 100644 --- a/core/gapil/langsvr/main.go +++ b/gapil/langsvr/main.go @@ -28,16 +28,15 @@ import ( "strings" "github.com/google/gapid/core/context/jot" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/format" - "github.com/google/gapid/core/gapil/parser" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/semantic/printer" + ls "github.com/google/gapid/core/langsvr" "github.com/google/gapid/core/log" "github.com/google/gapid/core/text/parse" - - "github.com/google/gapid/core/gapil/analysis" - ls "github.com/google/gapid/core/langsvr" + "github.com/google/gapid/gapil/analysis" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/format" + "github.com/google/gapid/gapil/parser" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/semantic/printer" ) const ( diff --git a/core/gapil/langsvr/vscode/extension.js b/gapil/langsvr/vscode/extension.js similarity index 100% rename from core/gapil/langsvr/vscode/extension.js rename to gapil/langsvr/vscode/extension.js diff --git a/core/gapil/langsvr/vscode/gfxapi.configuration.json b/gapil/langsvr/vscode/gfxapi.configuration.json similarity index 100% rename from core/gapil/langsvr/vscode/gfxapi.configuration.json rename to gapil/langsvr/vscode/gfxapi.configuration.json diff --git a/core/gapil/langsvr/vscode/gfxapi.json b/gapil/langsvr/vscode/gfxapi.json similarity index 100% rename from core/gapil/langsvr/vscode/gfxapi.json rename to gapil/langsvr/vscode/gfxapi.json diff --git a/core/gapil/langsvr/vscode/package.json b/gapil/langsvr/vscode/package.json similarity index 100% rename from core/gapil/langsvr/vscode/package.json rename to gapil/langsvr/vscode/package.json diff --git a/core/gapil/parser/CMakeFiles.cmake b/gapil/parser/CMakeFiles.cmake similarity index 100% rename from core/gapil/parser/CMakeFiles.cmake rename to gapil/parser/CMakeFiles.cmake diff --git a/core/gapil/parser/api.go b/gapil/parser/api.go similarity index 98% rename from core/gapil/parser/api.go rename to gapil/parser/api.go index 753a126525..b021e9cf24 100644 --- a/core/gapil/parser/api.go +++ b/gapil/parser/api.go @@ -15,7 +15,7 @@ package parser import ( - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/parser/expression.go b/gapil/parser/expression.go similarity index 99% rename from core/gapil/parser/expression.go rename to gapil/parser/expression.go index 2f349d1e6a..450b674b25 100644 --- a/core/gapil/parser/expression.go +++ b/gapil/parser/expression.go @@ -15,7 +15,7 @@ package parser import ( - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/parser/function.go b/gapil/parser/function.go similarity index 98% rename from core/gapil/parser/function.go rename to gapil/parser/function.go index 4a9362f1be..b3ec1b1198 100644 --- a/core/gapil/parser/function.go +++ b/gapil/parser/function.go @@ -15,7 +15,7 @@ package parser import ( - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/parser/identifier.go b/gapil/parser/identifier.go similarity index 98% rename from core/gapil/parser/identifier.go rename to gapil/parser/identifier.go index 7eece63734..f763abec31 100644 --- a/core/gapil/parser/identifier.go +++ b/gapil/parser/identifier.go @@ -15,7 +15,7 @@ package parser import ( - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/parser/operator.go b/gapil/parser/operator.go similarity index 98% rename from core/gapil/parser/operator.go rename to gapil/parser/operator.go index 87f13b9c77..e0afbd433e 100644 --- a/core/gapil/parser/operator.go +++ b/gapil/parser/operator.go @@ -18,7 +18,7 @@ import ( "unicode" "unicode/utf8" - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/parser/parser.go b/gapil/parser/parser.go similarity index 97% rename from core/gapil/parser/parser.go rename to gapil/parser/parser.go index 29406b68b6..407725927b 100644 --- a/core/gapil/parser/parser.go +++ b/gapil/parser/parser.go @@ -17,7 +17,7 @@ package parser import ( - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/parser/parser_test.go b/gapil/parser/parser_test.go similarity index 97% rename from core/gapil/parser/parser_test.go rename to gapil/parser/parser_test.go index 8051788119..a59b1a5924 100644 --- a/core/gapil/parser/parser_test.go +++ b/gapil/parser/parser_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/parser" + "github.com/google/gapid/gapil/parser" "github.com/google/gapid/core/text/parse" "github.com/google/gapid/core/text/parse/test" ) diff --git a/core/gapil/parser/statement.go b/gapil/parser/statement.go similarity index 99% rename from core/gapil/parser/statement.go rename to gapil/parser/statement.go index a991dbe3fd..f576fe6b27 100644 --- a/core/gapil/parser/statement.go +++ b/gapil/parser/statement.go @@ -15,7 +15,7 @@ package parser import ( - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/parser/type.go b/gapil/parser/type.go similarity index 99% rename from core/gapil/parser/type.go rename to gapil/parser/type.go index 332b7283ea..e51313d835 100644 --- a/core/gapil/parser/type.go +++ b/gapil/parser/type.go @@ -15,7 +15,7 @@ package parser import ( - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/resolver/CMakeFiles.cmake b/gapil/resolver/CMakeFiles.cmake similarity index 100% rename from core/gapil/resolver/CMakeFiles.cmake rename to gapil/resolver/CMakeFiles.cmake diff --git a/core/gapil/resolver/api.go b/gapil/resolver/api.go similarity index 98% rename from core/gapil/resolver/api.go rename to gapil/resolver/api.go index 0cd1eb7261..3fadf72502 100644 --- a/core/gapil/resolver/api.go +++ b/gapil/resolver/api.go @@ -18,8 +18,8 @@ import ( "sort" "strconv" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) func apiNames(rv *resolver, in *ast.API) { diff --git a/core/gapil/resolver/docs.go b/gapil/resolver/docs.go similarity index 97% rename from core/gapil/resolver/docs.go rename to gapil/resolver/docs.go index d17f75136f..a9aabd4795 100644 --- a/core/gapil/resolver/docs.go +++ b/gapil/resolver/docs.go @@ -17,7 +17,7 @@ package resolver import ( "strings" - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/resolver/expression.go b/gapil/resolver/expression.go similarity index 99% rename from core/gapil/resolver/expression.go rename to gapil/resolver/expression.go index aaae558bd8..853d3239a4 100644 --- a/core/gapil/resolver/expression.go +++ b/gapil/resolver/expression.go @@ -17,8 +17,8 @@ package resolver import ( "strconv" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) // entity translates the ast expression to a semantic expression, diff --git a/core/gapil/resolver/extract_calls.go b/gapil/resolver/extract_calls.go similarity index 98% rename from core/gapil/resolver/extract_calls.go rename to gapil/resolver/extract_calls.go index 4318c1693c..ef326ba85a 100644 --- a/core/gapil/resolver/extract_calls.go +++ b/gapil/resolver/extract_calls.go @@ -14,7 +14,7 @@ package resolver -import "github.com/google/gapid/core/gapil/semantic" +import "github.com/google/gapid/gapil/semantic" // extractCalls moves all call expressions to subroutines out to locals. // This is done so that there is an oppotunity to test for abort() before diff --git a/core/gapil/resolver/flow.go b/gapil/resolver/flow.go similarity index 99% rename from core/gapil/resolver/flow.go rename to gapil/resolver/flow.go index b83375fe29..8ba68f3dab 100644 --- a/core/gapil/resolver/flow.go +++ b/gapil/resolver/flow.go @@ -14,7 +14,7 @@ package resolver -import "github.com/google/gapid/core/gapil/semantic" +import "github.com/google/gapid/gapil/semantic" type visitedFuncs map[*semantic.Function]bool diff --git a/core/gapil/resolver/function.go b/gapil/resolver/function.go similarity index 98% rename from core/gapil/resolver/function.go rename to gapil/resolver/function.go index 437cf12ac7..7cb9527ae3 100644 --- a/core/gapil/resolver/function.go +++ b/gapil/resolver/function.go @@ -17,8 +17,8 @@ package resolver import ( "bytes" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) func functionSignature(rv *resolver, out *semantic.Function) { diff --git a/core/gapil/resolver/generic_subroutine.go b/gapil/resolver/generic_subroutine.go similarity index 96% rename from core/gapil/resolver/generic_subroutine.go rename to gapil/resolver/generic_subroutine.go index 87b4b1d576..15fb9e60c9 100644 --- a/core/gapil/resolver/generic_subroutine.go +++ b/gapil/resolver/generic_subroutine.go @@ -18,8 +18,8 @@ import ( "fmt" "strings" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) type genericSubroutine struct { diff --git a/core/gapil/resolver/inference.go b/gapil/resolver/inference.go similarity index 97% rename from core/gapil/resolver/inference.go rename to gapil/resolver/inference.go index 2409b85975..e6340918b1 100644 --- a/core/gapil/resolver/inference.go +++ b/gapil/resolver/inference.go @@ -17,8 +17,8 @@ package resolver import ( "strconv" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) func inferNumber(rv *resolver, in *ast.Number, infer semantic.Type) semantic.Expression { diff --git a/core/gapil/resolver/internal.go b/gapil/resolver/internal.go similarity index 98% rename from core/gapil/resolver/internal.go rename to gapil/resolver/internal.go index e33c01140c..b75e936376 100644 --- a/core/gapil/resolver/internal.go +++ b/gapil/resolver/internal.go @@ -15,8 +15,8 @@ package resolver import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) var ( diff --git a/core/gapil/resolver/operator.go b/gapil/resolver/operator.go similarity index 98% rename from core/gapil/resolver/operator.go rename to gapil/resolver/operator.go index 77a76c2b85..b5d6450090 100644 --- a/core/gapil/resolver/operator.go +++ b/gapil/resolver/operator.go @@ -15,8 +15,8 @@ package resolver import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) func unaryOp(rv *resolver, in *ast.UnaryOp) *semantic.UnaryOp { diff --git a/core/gapil/resolver/remove_dead_code.go b/gapil/resolver/remove_dead_code.go similarity index 97% rename from core/gapil/resolver/remove_dead_code.go rename to gapil/resolver/remove_dead_code.go index b7635798ca..a5b98d37a5 100644 --- a/core/gapil/resolver/remove_dead_code.go +++ b/gapil/resolver/remove_dead_code.go @@ -15,8 +15,8 @@ package resolver import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) // removeDeadCode removes if statement blocks when the conditional is a literal diff --git a/core/gapil/resolver/resolve.go b/gapil/resolver/resolve.go similarity index 96% rename from core/gapil/resolver/resolve.go rename to gapil/resolver/resolve.go index d5c698025a..9b79e7767f 100644 --- a/core/gapil/resolver/resolve.go +++ b/gapil/resolver/resolve.go @@ -20,9 +20,9 @@ package resolver import ( "fmt" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/parser" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/parser" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/resolver/resolve_test.go b/gapil/resolver/resolve_test.go similarity index 98% rename from core/gapil/resolver/resolve_test.go rename to gapil/resolver/resolve_test.go index ac050ae0c7..348ce29726 100644 --- a/core/gapil/resolver/resolve_test.go +++ b/gapil/resolver/resolve_test.go @@ -19,11 +19,11 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/parser" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/semantic/printer" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/parser" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/semantic/printer" "github.com/google/gapid/core/log" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/resolver/resolver.go b/gapil/resolver/resolver.go similarity index 98% rename from core/gapil/resolver/resolver.go rename to gapil/resolver/resolver.go index b88955f583..64e5624e12 100644 --- a/core/gapil/resolver/resolver.go +++ b/gapil/resolver/resolver.go @@ -19,8 +19,8 @@ import ( "reflect" "strings" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/resolver/rules.go b/gapil/resolver/rules.go similarity index 98% rename from core/gapil/resolver/rules.go rename to gapil/resolver/rules.go index 3f8c2b06bf..cbf6d92351 100644 --- a/core/gapil/resolver/rules.go +++ b/gapil/resolver/rules.go @@ -14,7 +14,7 @@ package resolver -import "github.com/google/gapid/core/gapil/semantic" +import "github.com/google/gapid/gapil/semantic" func implicit(lhs semantic.Type, rhs semantic.Type) bool { if lhs == semantic.AnyType { diff --git a/core/gapil/resolver/statement.go b/gapil/resolver/statement.go similarity index 99% rename from core/gapil/resolver/statement.go rename to gapil/resolver/statement.go index acc9ebfd1a..b2831caf46 100644 --- a/core/gapil/resolver/statement.go +++ b/gapil/resolver/statement.go @@ -15,8 +15,8 @@ package resolver import ( - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" ) func block(rv *resolver, in *ast.Block, owner semantic.Node) *semantic.Block { diff --git a/core/gapil/resolver/type.go b/gapil/resolver/type.go similarity index 98% rename from core/gapil/resolver/type.go rename to gapil/resolver/type.go index f89a1f63e2..c7ba41de75 100644 --- a/core/gapil/resolver/type.go +++ b/gapil/resolver/type.go @@ -20,9 +20,9 @@ import ( "strconv" "strings" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/semantic/printer" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/semantic/printer" ) const ( diff --git a/core/gapil/semantic/CMakeFiles.cmake b/gapil/semantic/CMakeFiles.cmake similarity index 100% rename from core/gapil/semantic/CMakeFiles.cmake rename to gapil/semantic/CMakeFiles.cmake diff --git a/core/gapil/semantic/api.go b/gapil/semantic/api.go similarity index 98% rename from core/gapil/semantic/api.go rename to gapil/semantic/api.go index ab7f74a7fd..f9e2baf9e8 100644 --- a/core/gapil/semantic/api.go +++ b/gapil/semantic/api.go @@ -16,7 +16,7 @@ // representation of the api language. package semantic -import "github.com/google/gapid/core/gapil/ast" +import "github.com/google/gapid/gapil/ast" // API is the root of the ASG, and holds a fully resolved api. type API struct { diff --git a/core/gapil/semantic/expression.go b/gapil/semantic/expression.go similarity index 99% rename from core/gapil/semantic/expression.go rename to gapil/semantic/expression.go index dfdae2a5f4..c4ba87a901 100644 --- a/core/gapil/semantic/expression.go +++ b/gapil/semantic/expression.go @@ -14,7 +14,7 @@ package semantic -import "github.com/google/gapid/core/gapil/ast" +import "github.com/google/gapid/gapil/ast" // Select is the expression form of a switch. type Select struct { diff --git a/core/gapil/semantic/function.go b/gapil/semantic/function.go similarity index 99% rename from core/gapil/semantic/function.go rename to gapil/semantic/function.go index c4caf42917..ffda5bae00 100644 --- a/core/gapil/semantic/function.go +++ b/gapil/semantic/function.go @@ -14,7 +14,7 @@ package semantic -import "github.com/google/gapid/core/gapil/ast" +import "github.com/google/gapid/gapil/ast" // Function represents function like objects in the semantic graph. type Function struct { diff --git a/core/gapil/semantic/interface_test.go b/gapil/semantic/interface_test.go similarity index 98% rename from core/gapil/semantic/interface_test.go rename to gapil/semantic/interface_test.go index c573c7de65..e439506998 100644 --- a/core/gapil/semantic/interface_test.go +++ b/gapil/semantic/interface_test.go @@ -14,7 +14,7 @@ package semantic_test -import "github.com/google/gapid/core/gapil/semantic" +import "github.com/google/gapid/gapil/semantic" var ( _ = []semantic.Node{ diff --git a/core/gapil/semantic/internal.go b/gapil/semantic/internal.go similarity index 98% rename from core/gapil/semantic/internal.go rename to gapil/semantic/internal.go index 34f067f133..424d42fd37 100644 --- a/core/gapil/semantic/internal.go +++ b/gapil/semantic/internal.go @@ -14,7 +14,7 @@ package semantic -import "github.com/google/gapid/core/gapil/ast" +import "github.com/google/gapid/gapil/ast" // Length represents a length of object expression. // Object must be of either pointer, slice, map or string type. diff --git a/core/gapil/semantic/invalid.go b/gapil/semantic/invalid.go similarity index 100% rename from core/gapil/semantic/invalid.go rename to gapil/semantic/invalid.go diff --git a/core/gapil/semantic/logical_order.go b/gapil/semantic/logical_order.go similarity index 100% rename from core/gapil/semantic/logical_order.go rename to gapil/semantic/logical_order.go diff --git a/core/gapil/semantic/node.go b/gapil/semantic/node.go similarity index 98% rename from core/gapil/semantic/node.go rename to gapil/semantic/node.go index 5ff1bd9bcc..690cd08be3 100644 --- a/core/gapil/semantic/node.go +++ b/gapil/semantic/node.go @@ -14,7 +14,7 @@ package semantic -import "github.com/google/gapid/core/gapil/ast" +import "github.com/google/gapid/gapil/ast" // Node represents any semantic-tree node type. type Node interface { diff --git a/core/gapil/semantic/printer/CMakeFiles.cmake b/gapil/semantic/printer/CMakeFiles.cmake similarity index 100% rename from core/gapil/semantic/printer/CMakeFiles.cmake rename to gapil/semantic/printer/CMakeFiles.cmake diff --git a/core/gapil/semantic/printer/printer.go b/gapil/semantic/printer/printer.go similarity index 99% rename from core/gapil/semantic/printer/printer.go rename to gapil/semantic/printer/printer.go index 18eb7ec44a..1ee8e3783b 100644 --- a/core/gapil/semantic/printer/printer.go +++ b/gapil/semantic/printer/printer.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/text/reflow" ) diff --git a/core/gapil/semantic/semantic_test.go b/gapil/semantic/semantic_test.go similarity index 98% rename from core/gapil/semantic/semantic_test.go rename to gapil/semantic/semantic_test.go index b008a4c271..f735427595 100644 --- a/core/gapil/semantic/semantic_test.go +++ b/gapil/semantic/semantic_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) type replaceTest struct { diff --git a/core/gapil/semantic/statement.go b/gapil/semantic/statement.go similarity index 99% rename from core/gapil/semantic/statement.go rename to gapil/semantic/statement.go index 6e011e3fc7..f9af1b1f0b 100644 --- a/core/gapil/semantic/statement.go +++ b/gapil/semantic/statement.go @@ -14,7 +14,7 @@ package semantic -import "github.com/google/gapid/core/gapil/ast" +import "github.com/google/gapid/gapil/ast" // Statement is the interface implemented by all statement types. type Statement interface { diff --git a/core/gapil/semantic/symbols.go b/gapil/semantic/symbols.go similarity index 100% rename from core/gapil/semantic/symbols.go rename to gapil/semantic/symbols.go diff --git a/core/gapil/semantic/type.go b/gapil/semantic/type.go similarity index 99% rename from core/gapil/semantic/type.go rename to gapil/semantic/type.go index db13231229..7fdee09b11 100644 --- a/core/gapil/semantic/type.go +++ b/gapil/semantic/type.go @@ -17,7 +17,7 @@ package semantic import ( "fmt" - "github.com/google/gapid/core/gapil/ast" + "github.com/google/gapid/gapil/ast" ) // Type is the interface to any object that can act as a type to the api diff --git a/core/gapil/semantic/visit.go b/gapil/semantic/visit.go similarity index 100% rename from core/gapil/semantic/visit.go rename to gapil/semantic/visit.go diff --git a/core/gapil/snippets/CMakeFiles.cmake b/gapil/snippets/CMakeFiles.cmake similarity index 100% rename from core/gapil/snippets/CMakeFiles.cmake rename to gapil/snippets/CMakeFiles.cmake diff --git a/core/gapil/snippets/can_follow.go b/gapil/snippets/can_follow.go similarity index 100% rename from core/gapil/snippets/can_follow.go rename to gapil/snippets/can_follow.go diff --git a/core/gapil/snippets/label.go b/gapil/snippets/label.go similarity index 100% rename from core/gapil/snippets/label.go rename to gapil/snippets/label.go diff --git a/core/gapil/snippets/observation.go b/gapil/snippets/observation.go similarity index 100% rename from core/gapil/snippets/observation.go rename to gapil/snippets/observation.go diff --git a/core/gapil/snippets/path.go b/gapil/snippets/path.go similarity index 100% rename from core/gapil/snippets/path.go rename to gapil/snippets/path.go diff --git a/core/gapil/snippets/snippet.go b/gapil/snippets/snippet.go similarity index 100% rename from core/gapil/snippets/snippet.go rename to gapil/snippets/snippet.go diff --git a/core/gapil/snippets/snippets.proto b/gapil/snippets/snippets.proto similarity index 94% rename from core/gapil/snippets/snippets.proto rename to gapil/snippets/snippets.proto index 1ec9983f00..0277149892 100644 --- a/core/gapil/snippets/snippets.proto +++ b/gapil/snippets/snippets.proto @@ -15,7 +15,7 @@ syntax = "proto3"; package snippets; -option go_package = "github.com/google/gapid/core/gapil/snippets"; +option go_package = "github.com/google/gapid/gapil/snippets"; option java_package = "com.google.gapid.proto.service.snippets"; option java_outer_classname = "SnippetsProtos"; diff --git a/core/gapil/template/CMakeFiles.cmake b/gapil/template/CMakeFiles.cmake similarity index 100% rename from core/gapil/template/CMakeFiles.cmake rename to gapil/template/CMakeFiles.cmake diff --git a/core/gapil/template/api.go b/gapil/template/api.go similarity index 99% rename from core/gapil/template/api.go rename to gapil/template/api.go index 69d18983ef..a7d168be70 100644 --- a/core/gapil/template/api.go +++ b/gapil/template/api.go @@ -17,7 +17,7 @@ package template import ( "fmt" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) // Unpack throws away type information to work around template system limitations diff --git a/core/gapil/template/format.go b/gapil/template/format.go similarity index 100% rename from core/gapil/template/format.go rename to gapil/template/format.go diff --git a/core/gapil/template/functions.go b/gapil/template/functions.go similarity index 99% rename from core/gapil/template/functions.go rename to gapil/template/functions.go index 76d0bde8d1..58f4056c9f 100644 --- a/core/gapil/template/functions.go +++ b/gapil/template/functions.go @@ -27,8 +27,8 @@ import ( "unicode/utf8" "github.com/google/gapid/core/fault" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/log" ) diff --git a/core/gapil/template/globals.go b/gapil/template/globals.go similarity index 100% rename from core/gapil/template/globals.go rename to gapil/template/globals.go diff --git a/core/gapil/template/list.go b/gapil/template/list.go similarity index 100% rename from core/gapil/template/list.go rename to gapil/template/list.go diff --git a/core/gapil/template/literals.go b/gapil/template/literals.go similarity index 100% rename from core/gapil/template/literals.go rename to gapil/template/literals.go diff --git a/core/gapil/template/literals_test.go b/gapil/template/literals_test.go similarity index 100% rename from core/gapil/template/literals_test.go rename to gapil/template/literals_test.go diff --git a/core/gapil/template/names.go b/gapil/template/names.go similarity index 98% rename from core/gapil/template/names.go rename to gapil/template/names.go index 3ba5f0172f..20ac32b3a2 100644 --- a/core/gapil/template/names.go +++ b/gapil/template/names.go @@ -18,7 +18,7 @@ import ( "fmt" "unicode" - "github.com/google/gapid/core/gapil/resolver" + "github.com/google/gapid/gapil/resolver" ) type nameOptions struct { diff --git a/core/gapil/template/strings.go b/gapil/template/strings.go similarity index 100% rename from core/gapil/template/strings.go rename to gapil/template/strings.go diff --git a/core/gapil/template/strings_examples_test.go b/gapil/template/strings_examples_test.go similarity index 100% rename from core/gapil/template/strings_examples_test.go rename to gapil/template/strings_examples_test.go diff --git a/core/gapil/template/strings_test.go b/gapil/template/strings_test.go similarity index 100% rename from core/gapil/template/strings_test.go rename to gapil/template/strings_test.go diff --git a/core/gapil/template/template.go b/gapil/template/template.go similarity index 100% rename from core/gapil/template/template.go rename to gapil/template/template.go diff --git a/core/gapil/template/types.go b/gapil/template/types.go similarity index 99% rename from core/gapil/template/types.go rename to gapil/template/types.go index bd80fbb64d..743e1c2e57 100644 --- a/core/gapil/template/types.go +++ b/gapil/template/types.go @@ -23,7 +23,7 @@ import ( "strings" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/semantic" ) var ( diff --git a/core/gapil/validate/CMakeFiles.cmake b/gapil/validate/CMakeFiles.cmake similarity index 100% rename from core/gapil/validate/CMakeFiles.cmake rename to gapil/validate/CMakeFiles.cmake diff --git a/core/gapil/validate/inspect.go b/gapil/validate/inspect.go similarity index 92% rename from core/gapil/validate/inspect.go rename to gapil/validate/inspect.go index d7f532372b..d61be6399b 100644 --- a/core/gapil/validate/inspect.go +++ b/gapil/validate/inspect.go @@ -18,9 +18,9 @@ import ( "fmt" "reflect" - "github.com/google/gapid/core/gapil/analysis" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/analysis" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" ) // ErrUnreachable is the error raised for unreachable code. diff --git a/core/gapil/validate/inspect_test.go b/gapil/validate/inspect_test.go similarity index 96% rename from core/gapil/validate/inspect_test.go rename to gapil/validate/inspect_test.go index 6625c67f7b..5bb18ca2f4 100644 --- a/core/gapil/validate/inspect_test.go +++ b/gapil/validate/inspect_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/google/gapid/core/assert" - "github.com/google/gapid/core/gapil" - "github.com/google/gapid/core/gapil/ast" - "github.com/google/gapid/core/gapil/parser" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" - "github.com/google/gapid/core/gapil/validate" + "github.com/google/gapid/gapil" + "github.com/google/gapid/gapil/ast" + "github.com/google/gapid/gapil/parser" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" + "github.com/google/gapid/gapil/validate" "github.com/google/gapid/core/log" ) diff --git a/core/gapil/validate/issues.go b/gapil/validate/issues.go similarity index 100% rename from core/gapil/validate/issues.go rename to gapil/validate/issues.go diff --git a/core/gapil/validate/no_unused.go b/gapil/validate/no_unused.go similarity index 98% rename from core/gapil/validate/no_unused.go rename to gapil/validate/no_unused.go index 6d3da3740b..f953f7e0d6 100644 --- a/core/gapil/validate/no_unused.go +++ b/gapil/validate/no_unused.go @@ -15,8 +15,8 @@ package validate import ( - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" "github.com/google/gapid/core/text/parse" ) diff --git a/core/gapil/validate/validate.go b/gapil/validate/validate.go similarity index 93% rename from core/gapil/validate/validate.go rename to gapil/validate/validate.go index 6544893dd6..98daa7b29b 100644 --- a/core/gapil/validate/validate.go +++ b/gapil/validate/validate.go @@ -21,9 +21,9 @@ package validate import ( "sort" - "github.com/google/gapid/core/gapil/analysis" - "github.com/google/gapid/core/gapil/resolver" - "github.com/google/gapid/core/gapil/semantic" + "github.com/google/gapid/gapil/analysis" + "github.com/google/gapid/gapil/resolver" + "github.com/google/gapid/gapil/semantic" ) // Options controls the validation that's performed. diff --git a/gapis/atom/cast.go b/gapis/atom/cast.go index 2360bb3a38..25503ce4fb 100644 --- a/gapis/atom/cast.go +++ b/gapis/atom/cast.go @@ -20,7 +20,7 @@ import ( "strings" "unicode" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/snippets" "github.com/google/gapid/core/log" "github.com/google/gapid/framework/binary" "github.com/google/gapid/framework/binary/schema" diff --git a/gapis/atom/snippet.go b/gapis/atom/snippet.go index 13a755478c..e11fb299ec 100644 --- a/gapis/atom/snippet.go +++ b/gapis/atom/snippet.go @@ -22,7 +22,7 @@ import ( "io" "os" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/snippets" "github.com/google/gapid/framework/binary" "github.com/google/gapid/framework/binary/cyclic" "github.com/google/gapid/framework/binary/registry" diff --git a/gapis/gfxapi/gles/metadata.go b/gapis/gfxapi/gles/metadata.go index 19ebc604cb..f919e90724 100644 --- a/gapis/gfxapi/gles/metadata.go +++ b/gapis/gfxapi/gles/metadata.go @@ -18,7 +18,7 @@ import ( "fmt" "reflect" - _ "github.com/google/gapid/core/gapil/snippets" + _ "github.com/google/gapid/gapil/snippets" "github.com/google/gapid/framework/binary" "github.com/google/gapid/framework/binary/registry" "github.com/google/gapid/gapis/atom" diff --git a/gapis/gfxapi/snippet.go b/gapis/gfxapi/snippet.go index ac19a55b21..9aacfc66ca 100644 --- a/gapis/gfxapi/snippet.go +++ b/gapis/gfxapi/snippet.go @@ -22,7 +22,7 @@ import ( "reflect" "unicode" - "github.com/google/gapid/core/gapil/snippets" + "github.com/google/gapid/gapil/snippets" "github.com/google/gapid/framework/binary" "github.com/google/gapid/framework/binary/cyclic" "github.com/google/gapid/framework/binary/registry"