Merge pull request #1753 from onflow/supun/rename-parser

Rename `parser2` package to `parser`

fuzz.go

@@ -21,7 +21,7 @@ package cadence
 import (
 	"unicode/utf8"
 
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/cadence/runtime/sema"
 	"github.com/onflow/cadence/runtime/tests/utils"
 )
@@ -32,7 +32,7 @@ func Fuzz(data []byte) int {
 		return 0
 	}
 
-	program, err := parser2.ParseProgram(string(data), nil)
+	program, err := parser.ParseProgram(string(data), nil)
 
 	if err != nil {
 		return 0

go.cap

@@ -2,7 +2,7 @@ github.com/onflow/cadence ()
 
 github.com/davecgh/go-spew/spew (file)
 github.com/onflow/cadence/runtime/interpreter (runtime)
-github.com/onflow/cadence/runtime/parser2 (file)
+github.com/onflow/cadence/runtime/parser (file)
 github.com/onflow/cadence/runtime/pretty (runtime)
 github.com/opentracing/opentracing-go (network)
 github.com/stretchr/testify/assert (runtime, file, network)

runtime/ast/inspector_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/cadence/runtime/tests/examples"
 )
 
@@ -34,7 +34,7 @@ func TestInspector_Elements(t *testing.T) {
 
 	t.Parallel()
 
-	program, err := parser2.ParseProgram(examples.FungibleTokenContractInterface, nil)
+	program, err := parser.ParseProgram(examples.FungibleTokenContractInterface, nil)
 	require.NoError(t, err)
 
 	inspector := ast.NewInspector(program)
@@ -103,7 +103,7 @@ func TestInspectorTypeFiltering(t *testing.T) {
       }
     `
 
-	program, err := parser2.ParseProgram(code, nil)
+	program, err := parser.ParseProgram(code, nil)
 	require.NoError(t, err)
 
 	inspector := ast.NewInspector(program)

runtime/ast/string_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 )
 
 func TestQuoteString(t *testing.T) {
@@ -76,7 +76,7 @@ func TestQuoteString(t *testing.T) {
 
 func TestStringQuick(t *testing.T) {
 	f := func(text string) bool {
-		res, errs := parser2.ParseExpression(ast.QuoteString(text), nil)
+		res, errs := parser.ParseExpression(ast.QuoteString(text), nil)
 		if len(errs) > 0 {
 			return false
 		}

runtime/cmd/cmd.go

@@ -26,7 +26,7 @@ import (
 	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/interpreter"
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/cadence/runtime/pretty"
 	"github.com/onflow/cadence/runtime/sema"
 	"github.com/onflow/cadence/runtime/stdlib"
@@ -62,7 +62,7 @@ func PrepareProgramFromFile(location common.StringLocation, codes map[common.Loc
 func PrepareProgram(code string, location common.Location, codes map[common.Location]string) (*ast.Program, func(error)) {
 	must := mustClosure(location, codes)
 
-	program, err := parser2.ParseProgram(code, nil)
+	program, err := parser.ParseProgram(code, nil)
 	codes[location] = code
 	must(err)
 

runtime/cmd/parse/main.go

@@ -34,7 +34,7 @@ import (
 
 	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/cadence/runtime/pretty"
 )
 
@@ -175,7 +175,7 @@ func runPath(path string, bench bool) (res result, succeeded bool) {
 			}
 		}()
 
-		program, err = parser2.ParseProgram(code, nil)
+		program, err = parser.ParseProgram(code, nil)
 		if !bench {
 			res.Program = program
 		}
@@ -189,7 +189,7 @@ func runPath(path string, bench bool) (res result, succeeded bool) {
 
 	if bench {
 		benchRes := benchParse(func() (err error) {
-			_, err = parser2.ParseProgram(code, nil)
+			_, err = parser.ParseProgram(code, nil)
 			return
 		})
 		res.Bench = &benchResult{

runtime/cmd/parse/main_wasm.go

@@ -27,7 +27,7 @@ import (
 	"syscall/js"
 
 	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 )
 
 const globalFunctionNamePrefix = "CADENCE_PARSER"
@@ -68,7 +68,7 @@ func parse(code string) string {
 			}
 		}()
 
-		res.Program, res.Error = parser2.ParseProgram(code, nil)
+		res.Program, res.Error = parser.ParseProgram(code, nil)
 	}()
 
 	serialized, err := json.Marshal(res)

runtime/convertValues_test.go

@@ -33,7 +33,7 @@ import (
 	"github.com/onflow/cadence"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/interpreter"
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/cadence/runtime/sema"
 	. "github.com/onflow/cadence/runtime/tests/utils"
 )
@@ -1818,7 +1818,7 @@ func TestExportTypeValue(t *testing.T) {
           pub struct S: SI {}
 
         `
-		program, err := parser2.ParseProgram(code, nil)
+		program, err := parser.ParseProgram(code, nil)
 		require.NoError(t, err)
 
 		checker, err := sema.NewChecker(program, TestLocation, nil, false)
@@ -1909,7 +1909,7 @@ func TestExportCapabilityValue(t *testing.T) {
 		const code = `
           pub struct S {}
         `
-		program, err := parser2.ParseProgram(code, nil)
+		program, err := parser.ParseProgram(code, nil)
 		require.NoError(t, err)
 
 		checker, err := sema.NewChecker(program, TestLocation, nil, false)
@@ -2022,7 +2022,7 @@ func TestExportLinkValue(t *testing.T) {
 		const code = `
           pub struct S {}
         `
-		program, err := parser2.ParseProgram(code, nil)
+		program, err := parser.ParseProgram(code, nil)
 		require.NoError(t, err)
 
 		checker, err := sema.NewChecker(program, TestLocation, nil, false)

runtime/literal.go

@@ -27,7 +27,7 @@ import (
 	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/interpreter"
-	"github.com/onflow/cadence/runtime/parser2"
+	"github.com/onflow/cadence/runtime/parser"
 	"github.com/onflow/cadence/runtime/sema"
 )
 
@@ -48,9 +48,9 @@ func ParseLiteral(
 	cadence.Value,
 	error,
 ) {
-	expression, errs := parser2.ParseExpression(literal, inter)
+	expression, errs := parser.ParseExpression(literal, inter)
 	if len(errs) > 0 {
-		return nil, parser2.Error{
+		return nil, parser.Error{
 			Code:   literal,
 			Errors: errs,
 		}
@@ -71,9 +71,9 @@ func ParseLiteralArgumentList(
 	[]cadence.Value,
 	error,
 ) {
-	arguments, errs := parser2.ParseArgumentList(argumentList, inter)
+	arguments, errs := parser.ParseArgumentList(argumentList, inter)
 	if len(errs) > 0 {
-		return nil, parser2.Error{
+		return nil, parser.Error{
 			Errors: errs,
 		}
 	}

runtime/parser2/benchmark_test.go → runtime/parser/benchmark_test.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"

runtime/parser2/comment.go → runtime/parser/comment.go

@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"
 	"strings"
 
-	"github.com/onflow/cadence/runtime/parser2/lexer"
+	"github.com/onflow/cadence/runtime/parser/lexer"
 )
 
 const blockCommentStart = "/*"

runtime/parser2/declaration.go → runtime/parser/declaration.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"encoding/hex"
@@ -27,7 +27,7 @@ import (
 	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/errors"
-	"github.com/onflow/cadence/runtime/parser2/lexer"
+	"github.com/onflow/cadence/runtime/parser/lexer"
 )
 
 func parseDeclarations(p *parser, endTokenType lexer.TokenType) (declarations []ast.Declaration) {

runtime/parser2/declaration_test.go → runtime/parser/declaration_test.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"

runtime/parser2/docstring.go → runtime/parser/docstring.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"regexp"

runtime/parser2/docstring_test.go → runtime/parser/docstring_test.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"testing"

runtime/parser2/errors.go → runtime/parser/errors.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"

runtime/parser2/expression.go → runtime/parser/expression.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"
@@ -27,7 +27,7 @@ import (
 	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/errors"
-	"github.com/onflow/cadence/runtime/parser2/lexer"
+	"github.com/onflow/cadence/runtime/parser/lexer"
 )
 
 const exprBindingPowerGap = 10

runtime/parser2/expression_test.go → runtime/parser/expression_test.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"

runtime/parser2/function.go → runtime/parser/function.go

@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"
 
 	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/parser2/lexer"
+	"github.com/onflow/cadence/runtime/parser/lexer"
 )
 
 func parseParameterList(p *parser) (parameterList *ast.ParameterList) {

runtime/parser2/integerliteralkind.go → runtime/parser/integerliteralkind.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"github.com/onflow/cadence/runtime/errors"

runtime/parser2/invalidnumberliteralkind.go → runtime/parser/invalidnumberliteralkind.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"github.com/onflow/cadence/runtime/errors"

runtime/parser2/keyword.go → runtime/parser/keyword.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 const (
 	keywordIf          = "if"

runtime/parser2/parser.go → runtime/parser/parser.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package parser2
+package parser
 
 import (
 	"fmt"
@@ -26,7 +26,7 @@ import (
 	"github.com/onflow/cadence/runtime/ast"
 	"github.com/onflow/cadence/runtime/common"
 	"github.com/onflow/cadence/runtime/errors"
-	"github.com/onflow/cadence/runtime/parser2/lexer"
+	"github.com/onflow/cadence/runtime/parser/lexer"
 )
 
 // expressionDepthLimit is the limit of how deeply nested an expression can get