From c7e6c9299a26f6b30aa26a090d6515ef47610b49 Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Tue, 4 Oct 2022 17:13:08 -0400 Subject: [PATCH] Removed runes from the test case --- parser/func_test.go | 2 +- parser/meta_test.go | 10 +++++----- parser/tree-tostring.go | 6 +++--- parser/type_test.go | 4 ++-- tests/parser/func/main.arf | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/parser/func_test.go b/parser/func_test.go index 7ad00d2..09c9e53 100644 --- a/parser/func_test.go +++ b/parser/func_test.go @@ -25,7 +25,7 @@ func ro cBasicPhrases [fn [gn 329 983 57] 123] func ro dArgumentTypes --- - [bird tree butterfly.wing "hello world" grass:Int:8:mut] + [bird tree butterfly.wing 'hello world' grass:Int:8:mut] func ro eMath > x:Int > y:Int diff --git a/parser/meta_test.go b/parser/meta_test.go index 07d3952..93428df 100644 --- a/parser/meta_test.go +++ b/parser/meta_test.go @@ -8,11 +8,11 @@ func TestMeta (test *testing.T) { cwd, _ := os.Getwd() checkTree ("../tests/parser/meta", false, `:arf -author "Sasha Koshka" -license "GPLv3" -require "` + filepath.Join(cwd, "./some/local/module") + `" -require "/usr/local/include/arf/someLibraryInstalledInStandardLocation" -require "/some/absolute/path/to/someModule" +author 'Sasha Koshka' +license 'GPLv3' +require '` + filepath.Join(cwd, "./some/local/module") + `' +require '/usr/local/include/arf/someLibraryInstalledInStandardLocation' +require '/some/absolute/path/to/someModule' --- `, test) } diff --git a/parser/tree-tostring.go b/parser/tree-tostring.go index 0ab3946..157e3ca 100644 --- a/parser/tree-tostring.go +++ b/parser/tree-tostring.go @@ -34,16 +34,16 @@ func (tree SyntaxTree) ToString (indent int) (output string) { output += doIndent(indent, ":arf\n") if tree.author != "" { - output += doIndent(indent, "author \"", tree.author, "\"\n") + output += doIndent(indent, "author '", tree.author, "'\n") } if tree.license != "" { - output += doIndent(indent, "license \"", tree.license, "\"\n") + output += doIndent(indent, "license '", tree.license, "'\n") } for _, name := range sortMapKeysAlphabetically(tree.requires) { require := tree.requires[name] - output += doIndent(indent, "require \"", require, "\"\n") + output += doIndent(indent, "require '", require, "'\n") } output += doIndent(indent, "---\n") diff --git a/parser/type_test.go b/parser/type_test.go index 6619c1d..5c0ec22 100644 --- a/parser/type_test.go +++ b/parser/type_test.go @@ -13,7 +13,7 @@ type ro bBitFields:Obj ro that:Int & 1 ro this:Int 298 & 24 type ro cInit:Obj - ro that:String "hello world" + ro that:String 'hello world' ro this:Int 23 type ro dInitInherit:aBasic ro that 9384 @@ -24,7 +24,7 @@ type ro eInitAndDefine:aBasic ro born:Int 4 ro in:Int ro the:Int:3 (9348 92384 92834) - ro walls:String "live in the walls, die in the walls." + ro walls:String 'live in the walls, die in the walls.' type ro fBasic:Int type ro gBasicInit:Int 6 diff --git a/tests/parser/func/main.arf b/tests/parser/func/main.arf index 3c47e1c..b8ed2d3 100644 --- a/tests/parser/func/main.arf +++ b/tests/parser/func/main.arf @@ -27,7 +27,7 @@ func ro cBasicPhrases func ro dArgumentTypes --- - [bird tree butterfly.wing "hello world" + [bird tree butterfly.wing 'hello world' grass:Int:mut:8] func ro eMath