Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move core/gapil -> gapil. #7

Merged
merged 2 commits into from
Mar 5, 2017
Merged

Move core/gapil -> gapil. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44c87e8
Move core/gapil -> gapil.
ben-clayton Mar 5, 2017
080a0a6
Fix langsvr crashes on windows.
ben-clayton Mar 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakeProto.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions cmd/annotate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/apic/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/apic/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/apic/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/verify_gles_api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
1 change: 0 additions & 1 deletion core/CMakeBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

build_subdirectory(cc)
build_subdirectory(data)
build_subdirectory(gapil)
build_subdirectory(os)
build_subdirectory(text)
build_subdirectory(vulkan)
Expand Down
2 changes: 1 addition & 1 deletion core/langsvr/uri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
0 core/gapil/CMakeBuild.cmake → gapil/CMakeBuild.cmake
View file
Open in desktop
File renamed without changes.
0 core/gapil/CMakeFiles.cmake → gapil/CMakeFiles.cmake
View file
Open in desktop
File renamed without changes.
0 core/gapil/analysis/CMakeFiles.cmake → gapil/analysis/CMakeFiles.cmake
View file
Open in desktop
File renamed without changes.
0 core/gapil/analysis/analysis.go → gapil/analysis/analysis.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions core/gapil/analysis/analyze.go → gapil/analysis/analyze.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions core/gapil/analysis/analyze_test.go → gapil/analysis/analyze_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/bool_value.go → gapil/analysis/bool_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{})
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/class_value.go → gapil/analysis/class_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"sort"
"strings"

"github.com/google/gapid/core/gapil/semantic"
"github.com/google/gapid/gapil/semantic"
)

// Value interface compliance checks.
Expand Down
4 changes: 2 additions & 2 deletions core/gapil/analysis/class_value_test.go → gapil/analysis/class_value_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/enum_value.go → gapil/analysis/enum_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"strings"

"github.com/google/gapid/core/gapil/semantic"
"github.com/google/gapid/gapil/semantic"
)

// Value interface compliance checks.
Expand Down
4 changes: 2 additions & 2 deletions core/gapil/analysis/expressions.go → gapil/analysis/expressions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/map_value.go → gapil/analysis/map_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"sort"
"strings"

"github.com/google/gapid/core/gapil/semantic"
"github.com/google/gapid/gapil/semantic"
)

// Value interface compliance check.
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/map_value_test.go → gapil/analysis/map_value_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 core/gapil/analysis/possibility.go → gapil/analysis/possibility.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion core/gapil/analysis/possibility_test.go → gapil/analysis/possibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/reference_value.go → gapil/analysis/reference_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"strings"

"github.com/google/gapid/core/gapil/semantic"
"github.com/google/gapid/gapil/semantic"
)

// Value interface compliance checks.
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/reference_value_test.go → gapil/analysis/reference_value_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/results.go → gapil/analysis/results.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions core/gapil/analysis/scope.go → gapil/analysis/scope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/uint_value.go → gapil/analysis/uint_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/uint_value_test.go → gapil/analysis/uint_value_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions core/gapil/analysis/unreachables.go → gapil/analysis/unreachables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/analysis/untracked_value.go → gapil/analysis/untracked_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions core/gapil/analysis/value.go → gapil/analysis/value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 core/gapil/annotate/CMakeFiles.cmake → gapil/annotate/CMakeFiles.cmake
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions core/gapil/annotate/annotate.go → gapil/annotate/annotate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/annotate/container.go → gapil/annotate/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 core/gapil/annotate/doc.go → gapil/annotate/doc.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions core/gapil/annotate/entity.go → gapil/annotate/entity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions core/gapil/annotate/location.go → gapil/annotate/location.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/annotate/nested.go → gapil/annotate/nested.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/gapil/annotate/path.go → gapil/annotate/path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/annotate/pointer.go → gapil/annotate/pointer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/gapil/annotate/snippets.go → gapil/annotate/snippets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions core/gapil/annotate/symbol.go → gapil/annotate/symbol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading