diff --git a/README.md b/README.md index 75001b7..4543afa 100644 --- a/README.md +++ b/README.md @@ -529,7 +529,7 @@ When using the compiled VM renderer, simple static-key partial data maps are opt Plush now has two render engines: - The classic interpreter, which remains the default. -- The compiled VM renderer, available from `github.com/gobuffalo/plush/v5/VM/plush`. +- The compiled VM renderer, available from `github.com/gobuffalo/plush/v5/vm/plush`. For one-off template strings, the interpreter is still a good default because the VM has to parse and compile before it can run. For templates rendered repeatedly, use the VM path. @@ -551,7 +551,7 @@ import ( "log" plush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" ) tmpl, err := vmplush.Compile(`

<%= greet(name) %>

`) @@ -578,7 +578,7 @@ Use this when an application already calls the root `plush.Render` function and ```go import ( plush "github.com/gobuffalo/plush/v5" - _ "github.com/gobuffalo/plush/v5/VM/plush" + _ "github.com/gobuffalo/plush/v5/vm/plush" ) plush.SetRenderMode(plush.RenderModeVM) @@ -593,7 +593,7 @@ For file-backed templates, enable a template cache. The interpreter stores parse ```go import ( plush "github.com/gobuffalo/plush/v5" - _ "github.com/gobuffalo/plush/v5/VM/plush" + _ "github.com/gobuffalo/plush/v5/vm/plush" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/templatecache/inmemory" ) @@ -628,7 +628,7 @@ import ( "fmt" plush "github.com/gobuffalo/plush/v5" - _ "github.com/gobuffalo/plush/v5/VM/plush" + _ "github.com/gobuffalo/plush/v5/vm/plush" "github.com/gobuffalo/plush/v5/helpers/meta" ) @@ -833,7 +833,7 @@ Important caveat: one-shot VM rendering is not the headline number because it in Run the benchmark matrix locally: ```sh -go test ./VM/vm -run '^$' -bench '^BenchmarkRenderModeMatrix/.*/(interpreter_ast_cache|vm_bytecode_cache)$' -benchmem -count=3 -benchtime=500ms +go test ./vm/vm -run '^$' -bench '^BenchmarkRenderModeMatrix/.*/(interpreter_ast_cache|vm_bytecode_cache)$' -benchmem -count=3 -benchtime=500ms ``` ### Automatic VM Fast Paths diff --git a/plush.go b/plush.go index 82f592f..4717bfc 100644 --- a/plush.go +++ b/plush.go @@ -367,7 +367,7 @@ func Render(input string, ctx hctx.Context) (string, error) { if GetRenderMode() == RenderModeVM { renderer, ok := registeredVMRenderer() if !ok { - return "", fmt.Errorf("%w: import github.com/gobuffalo/plush/v5/VM/plush to register it", ErrVMRendererNotRegistered) + return "", fmt.Errorf("%w: import github.com/gobuffalo/plush/v5/vm/plush to register it", ErrVMRendererNotRegistered) } return renderer(input, ctx) } diff --git a/VM/code/code.go b/vm/code/code.go similarity index 98% rename from VM/code/code.go rename to vm/code/code.go index a3aa612..a1df63a 100644 --- a/VM/code/code.go +++ b/vm/code/code.go @@ -122,7 +122,7 @@ const ( // Direct write opcodes are Plush fast paths. They fuse common // "load or call, then OpWrite" instruction pairs so rendering can write to - // the frame output without unnecessary stack traffic. See VM/FAST_PATHS.md. + // the frame output without unnecessary stack traffic. See vm/FAST_PATHS.md. OpWriteConstant OpWriteName OpWriteNameOrNull diff --git a/VM/code/code_test.go b/vm/code/code_test.go similarity index 100% rename from VM/code/code_test.go rename to vm/code/code_test.go diff --git a/VM/compiler/compiler.go b/vm/compiler/compiler.go similarity index 99% rename from VM/compiler/compiler.go rename to vm/compiler/compiler.go index 5a6ccc5..e9b4127 100644 --- a/VM/compiler/compiler.go +++ b/vm/compiler/compiler.go @@ -6,11 +6,11 @@ import ( "sort" "strings" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" "github.com/gobuffalo/plush/v5/parser" "github.com/gobuffalo/plush/v5/token" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) type Compiler struct { diff --git a/VM/compiler/compiler_test.go b/vm/compiler/compiler_test.go similarity index 99% rename from VM/compiler/compiler_test.go rename to vm/compiler/compiler_test.go index d782473..66ac32a 100644 --- a/VM/compiler/compiler_test.go +++ b/vm/compiler/compiler_test.go @@ -4,11 +4,11 @@ import ( "html/template" "testing" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" "github.com/gobuffalo/plush/v5/parser" "github.com/gobuffalo/plush/v5/token" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/compiler/emit.go b/vm/compiler/emit.go similarity index 98% rename from VM/compiler/emit.go rename to vm/compiler/emit.go index 51687f6..0a23d1d 100644 --- a/VM/compiler/emit.go +++ b/vm/compiler/emit.go @@ -1,8 +1,8 @@ package compiler import ( - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) func (c *Compiler) addConstant(obj object.Object) int { diff --git a/VM/compiler/fast_plan_ast.go b/vm/compiler/fast_plan_ast.go similarity index 99% rename from VM/compiler/fast_plan_ast.go rename to vm/compiler/fast_plan_ast.go index 976fb5f..ecc202f 100644 --- a/VM/compiler/fast_plan_ast.go +++ b/vm/compiler/fast_plan_ast.go @@ -6,16 +6,16 @@ import ( "sort" "strings" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" "github.com/gobuffalo/plush/v5/token" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) // fastRenderPlanFromProgram builds the richest fast render plan directly from // the Plush AST. It only returns a plan when every top-level statement has a // supported render shape; unsupported shapes intentionally fall back to -// bytecode/VM execution. See VM/FAST_PATHS.md. +// bytecode/VM execution. See vm/FAST_PATHS.md. func fastRenderPlanFromProgram(program *ast.Program) *FastRenderPlan { plan, _ := fastRenderPlanAnalysisFromProgram(program) return plan diff --git a/VM/compiler/fast_plan_ast_edges_test.go b/vm/compiler/fast_plan_ast_edges_test.go similarity index 99% rename from VM/compiler/fast_plan_ast_edges_test.go rename to vm/compiler/fast_plan_ast_edges_test.go index 9488d48..d1ee02d 100644 --- a/VM/compiler/fast_plan_ast_edges_test.go +++ b/vm/compiler/fast_plan_ast_edges_test.go @@ -3,11 +3,11 @@ package compiler import ( "testing" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" "github.com/gobuffalo/plush/v5/parser" "github.com/gobuffalo/plush/v5/token" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/compiler/fast_plan_bytecode.go b/vm/compiler/fast_plan_bytecode.go similarity index 98% rename from VM/compiler/fast_plan_bytecode.go rename to vm/compiler/fast_plan_bytecode.go index b2ffeac..bc0fe71 100644 --- a/VM/compiler/fast_plan_bytecode.go +++ b/vm/compiler/fast_plan_bytecode.go @@ -3,8 +3,8 @@ package compiler import ( "html/template" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) // fastRenderPlanFromInstructions is the narrower fallback planner. It recovers diff --git a/VM/compiler/fast_script_plan_test.go b/vm/compiler/fast_script_plan_test.go similarity index 100% rename from VM/compiler/fast_script_plan_test.go rename to vm/compiler/fast_script_plan_test.go diff --git a/VM/compiler/optimizer.go b/vm/compiler/optimizer.go similarity index 98% rename from VM/compiler/optimizer.go rename to vm/compiler/optimizer.go index a260a6c..780502a 100644 --- a/VM/compiler/optimizer.go +++ b/vm/compiler/optimizer.go @@ -3,8 +3,8 @@ package compiler import ( "html/template" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) // optimizeScope performs bytecode peephole rewrites for render hot paths, such diff --git a/VM/compiler/optimizer_test.go b/vm/compiler/optimizer_test.go similarity index 98% rename from VM/compiler/optimizer_test.go rename to vm/compiler/optimizer_test.go index 2fa7a58..915d51f 100644 --- a/VM/compiler/optimizer_test.go +++ b/vm/compiler/optimizer_test.go @@ -4,8 +4,8 @@ import ( "html/template" "testing" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/compiler/symbol_table.go b/vm/compiler/symbol_table.go similarity index 100% rename from VM/compiler/symbol_table.go rename to vm/compiler/symbol_table.go diff --git a/VM/compiler/symbol_table_test.go b/vm/compiler/symbol_table_test.go similarity index 100% rename from VM/compiler/symbol_table_test.go rename to vm/compiler/symbol_table_test.go diff --git a/VM/compiler/types.go b/vm/compiler/types.go similarity index 97% rename from VM/compiler/types.go rename to vm/compiler/types.go index 2a4bc12..375a305 100644 --- a/VM/compiler/types.go +++ b/vm/compiler/types.go @@ -3,9 +3,9 @@ package compiler import ( "sync/atomic" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) type Bytecode struct { @@ -78,7 +78,7 @@ type FastRenderPlan struct { NameCount int // Prepared caches the VM-side mixed/static-name/simple plan built from this // compiler plan. BindingPrepared caches interned context IDs for stable - // contexts. See VM/FAST_PATHS.md for the full fast path map. + // contexts. See vm/FAST_PATHS.md for the full fast path map. Prepared atomic.Value BindingPrepared atomic.Value } diff --git a/VM/object/builtins.go b/vm/object/builtins.go similarity index 100% rename from VM/object/builtins.go rename to vm/object/builtins.go diff --git a/VM/object/object.go b/vm/object/object.go similarity index 99% rename from VM/object/object.go rename to vm/object/object.go index 0e2f116..8572799 100644 --- a/VM/object/object.go +++ b/vm/object/object.go @@ -10,8 +10,8 @@ import ( "strings" "sync/atomic" - "github.com/gobuffalo/plush/v5/VM/code" "github.com/gobuffalo/plush/v5/ast" + "github.com/gobuffalo/plush/v5/vm/code" ) type BuiltinFunction func(args ...Object) Object diff --git a/VM/object/object_test.go b/vm/object/object_test.go similarity index 100% rename from VM/object/object_test.go rename to vm/object/object_test.go diff --git a/VM/plush/compiled_template_test.go b/vm/plush/compiled_template_test.go similarity index 95% rename from VM/plush/compiled_template_test.go rename to vm/plush/compiled_template_test.go index 28869b8..aa1464e 100644 --- a/VM/plush/compiled_template_test.go +++ b/vm/plush/compiled_template_test.go @@ -5,7 +5,7 @@ import ( "testing" rootplush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/plush/concurrency_test.go b/vm/plush/concurrency_test.go similarity index 98% rename from VM/plush/concurrency_test.go rename to vm/plush/concurrency_test.go index af952aa..541ec01 100644 --- a/VM/plush/concurrency_test.go +++ b/vm/plush/concurrency_test.go @@ -6,9 +6,9 @@ import ( "testing" rootplush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/templatecache/inmemory" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/plush/parity_basic_test.go b/vm/plush/parity_basic_test.go similarity index 100% rename from VM/plush/parity_basic_test.go rename to vm/plush/parity_basic_test.go diff --git a/VM/plush/parity_budget_test.go b/vm/plush/parity_budget_test.go similarity index 99% rename from VM/plush/parity_budget_test.go rename to vm/plush/parity_budget_test.go index 6daf6a9..6a37d7f 100644 --- a/VM/plush/parity_budget_test.go +++ b/vm/plush/parity_budget_test.go @@ -5,8 +5,8 @@ import ( "testing" rootplush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" "github.com/gobuffalo/plush/v5/helpers/hctx" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/plush/parity_conditions_test.go b/vm/plush/parity_conditions_test.go similarity index 100% rename from VM/plush/parity_conditions_test.go rename to vm/plush/parity_conditions_test.go diff --git a/VM/plush/parity_errors_test.go b/vm/plush/parity_errors_test.go similarity index 100% rename from VM/plush/parity_errors_test.go rename to vm/plush/parity_errors_test.go diff --git a/VM/plush/parity_functions_test.go b/vm/plush/parity_functions_test.go similarity index 100% rename from VM/plush/parity_functions_test.go rename to vm/plush/parity_functions_test.go diff --git a/VM/plush/parity_harness_test.go b/vm/plush/parity_harness_test.go similarity index 97% rename from VM/plush/parity_harness_test.go rename to vm/plush/parity_harness_test.go index c1cb4f3..b5c35cc 100644 --- a/VM/plush/parity_harness_test.go +++ b/vm/plush/parity_harness_test.go @@ -4,8 +4,8 @@ import ( "testing" rootplush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" "github.com/gobuffalo/plush/v5/helpers/hctx" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/plush/parity_helpers_test.go b/vm/plush/parity_helpers_test.go similarity index 100% rename from VM/plush/parity_helpers_test.go rename to vm/plush/parity_helpers_test.go diff --git a/VM/plush/parity_holes_test.go b/vm/plush/parity_holes_test.go similarity index 100% rename from VM/plush/parity_holes_test.go rename to vm/plush/parity_holes_test.go diff --git a/VM/plush/parity_loops_test.go b/vm/plush/parity_loops_test.go similarity index 100% rename from VM/plush/parity_loops_test.go rename to vm/plush/parity_loops_test.go diff --git a/VM/plush/parity_math_test.go b/vm/plush/parity_math_test.go similarity index 100% rename from VM/plush/parity_math_test.go rename to vm/plush/parity_math_test.go diff --git a/VM/plush/parity_optional_if_test.go b/vm/plush/parity_optional_if_test.go similarity index 100% rename from VM/plush/parity_optional_if_test.go rename to vm/plush/parity_optional_if_test.go diff --git a/VM/plush/parity_output_test.go b/vm/plush/parity_output_test.go similarity index 100% rename from VM/plush/parity_output_test.go rename to vm/plush/parity_output_test.go diff --git a/VM/plush/parity_partials_test.go b/vm/plush/parity_partials_test.go similarity index 99% rename from VM/plush/parity_partials_test.go rename to vm/plush/parity_partials_test.go index c22ee8e..0581a8c 100644 --- a/VM/plush/parity_partials_test.go +++ b/vm/plush/parity_partials_test.go @@ -7,10 +7,10 @@ import ( "testing" rootplush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" "github.com/gobuffalo/plush/v5/helpers/hctx" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/templatecache/inmemory" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/plush/parity_root_tests_test.go b/vm/plush/parity_root_tests_test.go similarity index 99% rename from VM/plush/parity_root_tests_test.go rename to vm/plush/parity_root_tests_test.go index bae261a..acd59bb 100644 --- a/VM/plush/parity_root_tests_test.go +++ b/vm/plush/parity_root_tests_test.go @@ -11,7 +11,7 @@ import ( "time" rootplush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/plush/parity_struct_access_test.go b/vm/plush/parity_struct_access_test.go similarity index 100% rename from VM/plush/parity_struct_access_test.go rename to vm/plush/parity_struct_access_test.go diff --git a/VM/plush/parity_syntax_test.go b/vm/plush/parity_syntax_test.go similarity index 100% rename from VM/plush/parity_syntax_test.go rename to vm/plush/parity_syntax_test.go diff --git a/VM/plush/parity_trim_tags_test.go b/vm/plush/parity_trim_tags_test.go similarity index 100% rename from VM/plush/parity_trim_tags_test.go rename to vm/plush/parity_trim_tags_test.go diff --git a/VM/plush/parity_variables_test.go b/vm/plush/parity_variables_test.go similarity index 100% rename from VM/plush/parity_variables_test.go rename to vm/plush/parity_variables_test.go diff --git a/VM/plush/plush.go b/vm/plush/plush.go similarity index 97% rename from VM/plush/plush.go rename to vm/plush/plush.go index 3f72df5..892b3f4 100644 --- a/VM/plush/plush.go +++ b/vm/plush/plush.go @@ -4,8 +4,8 @@ import ( "fmt" rootplush "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/vm" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/vm" ) type Template = vm.Template diff --git a/VM/plush/plush_test.go b/vm/plush/plush_test.go similarity index 98% rename from VM/plush/plush_test.go rename to vm/plush/plush_test.go index 5bb4218..5177e16 100644 --- a/VM/plush/plush_test.go +++ b/vm/plush/plush_test.go @@ -7,7 +7,7 @@ import ( "testing" rootplush "github.com/gobuffalo/plush/v5" - vmplush "github.com/gobuffalo/plush/v5/VM/plush" + vmplush "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/plush/render_mode_test.go b/vm/plush/render_mode_test.go similarity index 99% rename from VM/plush/render_mode_test.go rename to vm/plush/render_mode_test.go index 27fc8cd..6b553a1 100644 --- a/VM/plush/render_mode_test.go +++ b/vm/plush/render_mode_test.go @@ -5,9 +5,9 @@ import ( "time" rootplush "github.com/gobuffalo/plush/v5" - _ "github.com/gobuffalo/plush/v5/VM/plush" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/templatecache/inmemory" + _ "github.com/gobuffalo/plush/v5/vm/plush" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/benchmark_test.go b/vm/vm/benchmark_test.go similarity index 100% rename from VM/vm/benchmark_test.go rename to vm/vm/benchmark_test.go diff --git a/VM/vm/binding_context_helpers_test.go b/vm/vm/binding_context_helpers_test.go similarity index 99% rename from VM/vm/binding_context_helpers_test.go rename to vm/vm/binding_context_helpers_test.go index afc5c23..11219c8 100644 --- a/VM/vm/binding_context_helpers_test.go +++ b/vm/vm/binding_context_helpers_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/budget.go b/vm/vm/budget.go similarity index 100% rename from VM/vm/budget.go rename to vm/vm/budget.go diff --git a/VM/vm/execute_for_helpers_test.go b/vm/vm/execute_for_helpers_test.go similarity index 98% rename from VM/vm/execute_for_helpers_test.go rename to vm/vm/execute_for_helpers_test.go index 6a1ca74..5e09191 100644 --- a/VM/vm/execute_for_helpers_test.go +++ b/vm/vm/execute_for_helpers_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/execution.go b/vm/vm/execution.go similarity index 99% rename from VM/vm/execution.go rename to vm/vm/execution.go index 58c3b93..35f22db 100644 --- a/VM/vm/execution.go +++ b/vm/vm/execution.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) func (vm *VM) LastPoppedStackElem() object.Object { diff --git a/VM/vm/execution_fast_value_helpers_test.go b/vm/vm/execution_fast_value_helpers_test.go similarity index 98% rename from VM/vm/execution_fast_value_helpers_test.go rename to vm/vm/execution_fast_value_helpers_test.go index 9b9816b..97e2fb8 100644 --- a/VM/vm/execution_fast_value_helpers_test.go +++ b/vm/vm/execution_fast_value_helpers_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_access_chain_helpers_test.go b/vm/vm/fast_access_chain_helpers_test.go similarity index 99% rename from VM/vm/fast_access_chain_helpers_test.go rename to vm/vm/fast_access_chain_helpers_test.go index 49c2ce2..41c99b4 100644 --- a/VM/vm/fast_access_chain_helpers_test.go +++ b/vm/vm/fast_access_chain_helpers_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_bindings.go b/vm/vm/fast_bindings.go similarity index 99% rename from VM/vm/fast_bindings.go rename to vm/vm/fast_bindings.go index 317825c..db21e4b 100644 --- a/VM/vm/fast_bindings.go +++ b/vm/vm/fast_bindings.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" ) type fastRenderBindings struct { diff --git a/VM/vm/fast_cache_partial_helpers_test.go b/vm/vm/fast_cache_partial_helpers_test.go similarity index 99% rename from VM/vm/fast_cache_partial_helpers_test.go rename to vm/vm/fast_cache_partial_helpers_test.go index 889ee22..17a62dc 100644 --- a/VM/vm/fast_cache_partial_helpers_test.go +++ b/vm/vm/fast_cache_partial_helpers_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/meta" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_calls.go b/vm/vm/fast_calls.go similarity index 99% rename from VM/vm/fast_calls.go rename to vm/vm/fast_calls.go index b582579..420ab2a 100644 --- a/VM/vm/fast_calls.go +++ b/vm/vm/fast_calls.go @@ -8,9 +8,9 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) func (a *fastCallArgs) Append(value interface{}) { diff --git a/VM/vm/fast_calls_helpers_test.go b/vm/vm/fast_calls_helpers_test.go similarity index 99% rename from VM/vm/fast_calls_helpers_test.go rename to vm/vm/fast_calls_helpers_test.go index f0f650b..78d2d40 100644 --- a/VM/vm/fast_calls_helpers_test.go +++ b/vm/vm/fast_calls_helpers_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_condition_property_helpers_test.go b/vm/vm/fast_condition_property_helpers_test.go similarity index 99% rename from VM/vm/fast_condition_property_helpers_test.go rename to vm/vm/fast_condition_property_helpers_test.go index 782f2b5..7e711de 100644 --- a/VM/vm/fast_condition_property_helpers_test.go +++ b/vm/vm/fast_condition_property_helpers_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_helpers.go b/vm/vm/fast_helpers.go similarity index 99% rename from VM/vm/fast_helpers.go rename to vm/vm/fast_helpers.go index 42f6394..cc0e418 100644 --- a/VM/vm/fast_helpers.go +++ b/vm/vm/fast_helpers.go @@ -10,8 +10,8 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/object" ) var ErrFastUnsupported = errors.New("fast write unsupported") diff --git a/VM/vm/fast_invoker_arg_helpers_test.go b/vm/vm/fast_invoker_arg_helpers_test.go similarity index 98% rename from VM/vm/fast_invoker_arg_helpers_test.go rename to vm/vm/fast_invoker_arg_helpers_test.go index 899787d..e555e01 100644 --- a/VM/vm/fast_invoker_arg_helpers_test.go +++ b/vm/vm/fast_invoker_arg_helpers_test.go @@ -5,7 +5,7 @@ import ( "math" "testing" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_invokers.go b/vm/vm/fast_invokers.go similarity index 99% rename from VM/vm/fast_invokers.go rename to vm/vm/fast_invokers.go index 689d74d..ce2a346 100644 --- a/VM/vm/fast_invokers.go +++ b/vm/vm/fast_invokers.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/object" ) func writeFastBuilderInvokerForRaw(raw interface{}) writeFastBuilderInvoker { diff --git a/VM/vm/fast_invokers_test.go b/vm/vm/fast_invokers_test.go similarity index 99% rename from VM/vm/fast_invokers_test.go rename to vm/vm/fast_invokers_test.go index 0265689..dcd0488 100644 --- a/VM/vm/fast_invokers_test.go +++ b/vm/vm/fast_invokers_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_loop_branch_edges_test.go b/vm/vm/fast_loop_branch_edges_test.go similarity index 99% rename from VM/vm/fast_loop_branch_edges_test.go rename to vm/vm/fast_loop_branch_edges_test.go index eb484b8..b9da64b 100644 --- a/VM/vm/fast_loop_branch_edges_test.go +++ b/vm/vm/fast_loop_branch_edges_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_loop_helpers_test.go b/vm/vm/fast_loop_helpers_test.go similarity index 99% rename from VM/vm/fast_loop_helpers_test.go rename to vm/vm/fast_loop_helpers_test.go index 5f2018d..d310c21 100644 --- a/VM/vm/fast_loop_helpers_test.go +++ b/vm/vm/fast_loop_helpers_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_loops.go b/vm/vm/fast_loops.go similarity index 99% rename from VM/vm/fast_loops.go rename to vm/vm/fast_loops.go index 87e3e84..243b14e 100644 --- a/VM/vm/fast_loops.go +++ b/vm/vm/fast_loops.go @@ -6,9 +6,9 @@ import ( "reflect" "strings" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) var ( diff --git a/VM/vm/fast_output.go b/vm/vm/fast_output.go similarity index 99% rename from VM/vm/fast_output.go rename to vm/vm/fast_output.go index 3e48eb9..ae53ae4 100644 --- a/VM/vm/fast_output.go +++ b/vm/vm/fast_output.go @@ -9,8 +9,8 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/object" ) func writeBuilderFastInt(out *strings.Builder, value int64) { diff --git a/VM/vm/fast_render.go b/vm/vm/fast_render.go similarity index 99% rename from VM/vm/fast_render.go rename to vm/vm/fast_render.go index 00a9bb6..3db5c0b 100644 --- a/VM/vm/fast_render.go +++ b/vm/vm/fast_render.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) // tryRenderFastBytecode is the VM fast-render entry point. A false handled diff --git a/VM/vm/fast_render_edge_helpers_test.go b/vm/vm/fast_render_edge_helpers_test.go similarity index 99% rename from VM/vm/fast_render_edge_helpers_test.go rename to vm/vm/fast_render_edge_helpers_test.go index d760346..c7ef35d 100644 --- a/VM/vm/fast_render_edge_helpers_test.go +++ b/vm/vm/fast_render_edge_helpers_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_render_segments_test.go b/vm/vm/fast_render_segments_test.go similarity index 99% rename from VM/vm/fast_render_segments_test.go rename to vm/vm/fast_render_segments_test.go index 1662f29..00a6044 100644 --- a/VM/vm/fast_render_segments_test.go +++ b/vm/vm/fast_render_segments_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_script_plan_test.go b/vm/vm/fast_script_plan_test.go similarity index 100% rename from VM/vm/fast_script_plan_test.go rename to vm/vm/fast_script_plan_test.go diff --git a/VM/vm/fast_struct_loop_call_paths_test.go b/vm/vm/fast_struct_loop_call_paths_test.go similarity index 99% rename from VM/vm/fast_struct_loop_call_paths_test.go rename to vm/vm/fast_struct_loop_call_paths_test.go index ec67831..35dfe78 100644 --- a/VM/vm/fast_struct_loop_call_paths_test.go +++ b/vm/vm/fast_struct_loop_call_paths_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_struct_loop_helpers_test.go b/vm/vm/fast_struct_loop_helpers_test.go similarity index 99% rename from VM/vm/fast_struct_loop_helpers_test.go rename to vm/vm/fast_struct_loop_helpers_test.go index 3b58757..9164b4e 100644 --- a/VM/vm/fast_struct_loop_helpers_test.go +++ b/vm/vm/fast_struct_loop_helpers_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" + "github.com/gobuffalo/plush/v5/vm/compiler" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_struct_loops.go b/vm/vm/fast_struct_loops.go similarity index 99% rename from VM/vm/fast_struct_loops.go rename to vm/vm/fast_struct_loops.go index 180c351..e08d6f0 100644 --- a/VM/vm/fast_struct_loops.go +++ b/vm/vm/fast_struct_loops.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) func renderFastStringKeyValueLoop(out *strings.Builder, ctx hctx.Context, loop *compiler.FastLoopPlan, iter []string) (bool, error) { diff --git a/VM/vm/fast_types.go b/vm/vm/fast_types.go similarity index 99% rename from VM/vm/fast_types.go rename to vm/vm/fast_types.go index 9133435..cb32152 100644 --- a/VM/vm/fast_types.go +++ b/vm/vm/fast_types.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) type callCacheEntry struct { diff --git a/VM/vm/fast_value_helpers_test.go b/vm/vm/fast_value_helpers_test.go similarity index 99% rename from VM/vm/fast_value_helpers_test.go rename to vm/vm/fast_value_helpers_test.go index eb0b2f7..cab53b4 100644 --- a/VM/vm/fast_value_helpers_test.go +++ b/vm/vm/fast_value_helpers_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/fast_values.go b/vm/vm/fast_values.go similarity index 99% rename from VM/vm/fast_values.go rename to vm/vm/fast_values.go index c497d1d..20b4be7 100644 --- a/VM/vm/fast_values.go +++ b/vm/vm/fast_values.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) func evalFastValue(value *compiler.FastValuePlan, ctx hctx.Context, bindings fastRenderBindings, base interface{}) (interface{}, bool, error) { diff --git a/VM/vm/frame.go b/vm/vm/frame.go similarity index 89% rename from VM/vm/frame.go rename to vm/vm/frame.go index 87d0af4..abdb447 100644 --- a/VM/vm/frame.go +++ b/vm/vm/frame.go @@ -3,8 +3,8 @@ package vm import ( "strings" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) type Frame struct { diff --git a/VM/vm/interpreter_fallback_test.go b/vm/vm/interpreter_fallback_test.go similarity index 100% rename from VM/vm/interpreter_fallback_test.go rename to vm/vm/interpreter_fallback_test.go diff --git a/VM/vm/loops_context.go b/vm/vm/loops_context.go similarity index 99% rename from VM/vm/loops_context.go rename to vm/vm/loops_context.go index a538f52..a377d60 100644 --- a/VM/vm/loops_context.go +++ b/vm/vm/loops_context.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) func (vm *VM) executeFor(iterable object.Object, block *object.Closure, keyName, valueName string) (object.Object, error) { diff --git a/VM/vm/native_calls.go b/vm/vm/native_calls.go similarity index 99% rename from VM/vm/native_calls.go rename to vm/vm/native_calls.go index 382e2be..be88495 100644 --- a/VM/vm/native_calls.go +++ b/vm/vm/native_calls.go @@ -8,8 +8,8 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/object" ) func writeFastCallValue(out *strings.Builder, ctx hctx.Context, name string, raw interface{}, args *fastCallArgs, cacheSlot *object.InlineCacheSlot) error { diff --git a/VM/vm/native_calls_test.go b/vm/vm/native_calls_test.go similarity index 99% rename from VM/vm/native_calls_test.go rename to vm/vm/native_calls_test.go index bab38df..6cbbc96 100644 --- a/VM/vm/native_calls_test.go +++ b/vm/vm/native_calls_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/native_property_cache_helpers_test.go b/vm/vm/native_property_cache_helpers_test.go similarity index 99% rename from VM/vm/native_property_cache_helpers_test.go rename to vm/vm/native_property_cache_helpers_test.go index e798c17..3ec213e 100644 --- a/VM/vm/native_property_cache_helpers_test.go +++ b/vm/vm/native_property_cache_helpers_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/numeric.go b/vm/vm/numeric.go similarity index 98% rename from VM/vm/numeric.go rename to vm/vm/numeric.go index 5d5f5ae..4b8b4e7 100644 --- a/VM/vm/numeric.go +++ b/vm/vm/numeric.go @@ -5,8 +5,8 @@ import ( "math" "reflect" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/object" ) type numericKind int diff --git a/VM/vm/numeric_reflect_helpers_test.go b/vm/vm/numeric_reflect_helpers_test.go similarity index 99% rename from VM/vm/numeric_reflect_helpers_test.go rename to vm/vm/numeric_reflect_helpers_test.go index 69016ad..1b6bc17 100644 --- a/VM/vm/numeric_reflect_helpers_test.go +++ b/vm/vm/numeric_reflect_helpers_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/numeric_truth_field_helpers_test.go b/vm/vm/numeric_truth_field_helpers_test.go similarity index 99% rename from VM/vm/numeric_truth_field_helpers_test.go rename to vm/vm/numeric_truth_field_helpers_test.go index d903867..4b27850 100644 --- a/VM/vm/numeric_truth_field_helpers_test.go +++ b/vm/vm/numeric_truth_field_helpers_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/partial_cache.go b/vm/vm/partial_cache.go similarity index 98% rename from VM/vm/partial_cache.go rename to vm/vm/partial_cache.go index 90d110e..740d55b 100644 --- a/VM/vm/partial_cache.go +++ b/vm/vm/partial_cache.go @@ -1,9 +1,9 @@ package vm import ( - "github.com/gobuffalo/plush/v5/VM/compiler" "github.com/gobuffalo/plush/v5/helpers/hctx" "github.com/gobuffalo/plush/v5/helpers/meta" + "github.com/gobuffalo/plush/v5/vm/compiler" ) func newPartialBytecodeLinkCache() *partialBytecodeLinkCache { diff --git a/VM/vm/partial_direct_edges_test.go b/vm/vm/partial_direct_edges_test.go similarity index 99% rename from VM/vm/partial_direct_edges_test.go rename to vm/vm/partial_direct_edges_test.go index 77403de..5b8a29b 100644 --- a/VM/vm/partial_direct_edges_test.go +++ b/vm/vm/partial_direct_edges_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/templatecache/inmemory" + "github.com/gobuffalo/plush/v5/vm/compiler" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/partial_inline_edges_test.go b/vm/vm/partial_inline_edges_test.go similarity index 96% rename from VM/vm/partial_inline_edges_test.go rename to vm/vm/partial_inline_edges_test.go index 4ba576d..4869496 100644 --- a/VM/vm/partial_inline_edges_test.go +++ b/vm/vm/partial_inline_edges_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" + "github.com/gobuffalo/plush/v5/vm/compiler" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/partials.go b/vm/vm/partials.go similarity index 99% rename from VM/vm/partials.go rename to vm/vm/partials.go index be971bd..0b078f3 100644 --- a/VM/vm/partials.go +++ b/vm/vm/partials.go @@ -9,10 +9,10 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" "github.com/gobuffalo/plush/v5/helpers/meta" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) func installVMPartialHelper(ctx hctx.Context) func() { diff --git a/VM/vm/render_diagnostics.go b/vm/vm/render_diagnostics.go similarity index 99% rename from VM/vm/render_diagnostics.go rename to vm/vm/render_diagnostics.go index 3090b33..ca10f5c 100644 --- a/VM/vm/render_diagnostics.go +++ b/vm/vm/render_diagnostics.go @@ -2,8 +2,8 @@ package vm import ( "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" ) func updateBytecodeDiagnostics(ctx hctx.Context, bytecode *compiler.Bytecode) { diff --git a/VM/vm/render_diagnostics_test.go b/vm/vm/render_diagnostics_test.go similarity index 99% rename from VM/vm/render_diagnostics_test.go rename to vm/vm/render_diagnostics_test.go index edd1d8d..549d302 100644 --- a/VM/vm/render_diagnostics_test.go +++ b/vm/vm/render_diagnostics_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" "github.com/gobuffalo/plush/v5/helpers/meta" + "github.com/gobuffalo/plush/v5/vm/compiler" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/render_output.go b/vm/vm/render_output.go similarity index 99% rename from VM/vm/render_output.go rename to vm/vm/render_output.go index ef1dab8..a96a43a 100644 --- a/VM/vm/render_output.go +++ b/vm/vm/render_output.go @@ -8,7 +8,7 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/object" ) func (vm *VM) stringConstant(index int) string { diff --git a/VM/vm/render_partial_misc_helpers_test.go b/vm/vm/render_partial_misc_helpers_test.go similarity index 99% rename from VM/vm/render_partial_misc_helpers_test.go rename to vm/vm/render_partial_misc_helpers_test.go index 5d1e1a4..bd5727c 100644 --- a/VM/vm/render_partial_misc_helpers_test.go +++ b/vm/vm/render_partial_misc_helpers_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/meta" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/runtime.go b/vm/vm/runtime.go similarity index 99% rename from VM/vm/runtime.go rename to vm/vm/runtime.go index cf79263..9483447 100644 --- a/VM/vm/runtime.go +++ b/vm/vm/runtime.go @@ -6,11 +6,11 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" "github.com/gobuffalo/plush/v5/helpers/hctx" "github.com/gobuffalo/plush/v5/parser" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) func New(bytecode *compiler.Bytecode) *VM { diff --git a/VM/vm/runtime_helpers_test.go b/vm/vm/runtime_helpers_test.go similarity index 99% rename from VM/vm/runtime_helpers_test.go rename to vm/vm/runtime_helpers_test.go index 8287575..9b71891 100644 --- a/VM/vm/runtime_helpers_test.go +++ b/vm/vm/runtime_helpers_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/parser" "github.com/gobuffalo/plush/v5/templatecache/inmemory" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/runtime_run_dispatch_test.go b/vm/vm/runtime_run_dispatch_test.go similarity index 99% rename from VM/vm/runtime_run_dispatch_test.go rename to vm/vm/runtime_run_dispatch_test.go index 8150b17..2211062 100644 --- a/VM/vm/runtime_run_dispatch_test.go +++ b/vm/vm/runtime_run_dispatch_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/source_cache.go b/vm/vm/source_cache.go similarity index 97% rename from VM/vm/source_cache.go rename to vm/vm/source_cache.go index c90cc12..4c4d3bf 100644 --- a/VM/vm/source_cache.go +++ b/vm/vm/source_cache.go @@ -4,7 +4,7 @@ import ( "hash/maphash" "sync" - "github.com/gobuffalo/plush/v5/VM/compiler" + "github.com/gobuffalo/plush/v5/vm/compiler" ) const sourceBytecodeCacheLimit = 1024 diff --git a/VM/vm/vm.go b/vm/vm/vm.go similarity index 97% rename from VM/vm/vm.go rename to vm/vm/vm.go index a70715b..8e6a03c 100644 --- a/VM/vm/vm.go +++ b/vm/vm/vm.go @@ -8,9 +8,9 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/helpers/hctx" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" ) const StackSize = 2048 diff --git a/VM/vm/vm_package_coverage_edges_test.go b/vm/vm/vm_package_coverage_edges_test.go similarity index 99% rename from VM/vm/vm_package_coverage_edges_test.go rename to vm/vm/vm_package_coverage_edges_test.go index b84f068..e02b194 100644 --- a/VM/vm/vm_package_coverage_edges_test.go +++ b/vm/vm/vm_package_coverage_edges_test.go @@ -8,13 +8,13 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" "github.com/gobuffalo/plush/v5/helpers/hctx" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/templatecache/inmemory" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/vm_test.go b/vm/vm/vm_test.go similarity index 99% rename from VM/vm/vm_test.go rename to vm/vm/vm_test.go index 704d517..055266b 100644 --- a/VM/vm/vm_test.go +++ b/vm/vm/vm_test.go @@ -11,14 +11,14 @@ import ( "time" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" "github.com/gobuffalo/plush/v5/ast" "github.com/gobuffalo/plush/v5/helpers/hctx" "github.com/gobuffalo/plush/v5/helpers/meta" "github.com/gobuffalo/plush/v5/parser" "github.com/gobuffalo/plush/v5/templatecache/inmemory" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" ) diff --git a/VM/vm/write_name_call_helpers_test.go b/vm/vm/write_name_call_helpers_test.go similarity index 98% rename from VM/vm/write_name_call_helpers_test.go rename to vm/vm/write_name_call_helpers_test.go index 87f3507..d241920 100644 --- a/VM/vm/write_name_call_helpers_test.go +++ b/vm/vm/write_name_call_helpers_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/gobuffalo/plush/v5" - "github.com/gobuffalo/plush/v5/VM/code" - "github.com/gobuffalo/plush/v5/VM/compiler" - "github.com/gobuffalo/plush/v5/VM/object" + "github.com/gobuffalo/plush/v5/vm/code" + "github.com/gobuffalo/plush/v5/vm/compiler" + "github.com/gobuffalo/plush/v5/vm/object" "github.com/stretchr/testify/require" )