From 729fe59578e4be7752b5d77a7c7e1ea07c523275 Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Tue, 29 May 2018 14:01:46 -0700 Subject: [PATCH] [edn] Pre: Rename keyword to namespaced_keyword. The `Keyword` type evolved to become more general: we now use the one type for both :regular and :name/spaced keywords. This changes reflects the new generality. --- edn/src/edn.rustpeg | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/edn/src/edn.rustpeg b/edn/src/edn.rustpeg index da0e9905..c09ac224 100644 --- a/edn/src/edn.rustpeg +++ b/edn/src/edn.rustpeg @@ -203,25 +203,26 @@ pub op -> OpType = ":db/add" { OpType::Add } / ":db/retract" { OpType::Retract } -raw_keyword -> Keyword +raw_namespaced_keyword -> Keyword = keyword_prefix ns:$(symbol_namespace) namespace_separator n:$(symbol_name) { Keyword::namespaced(ns, n) } + / #expected("namespaced keyword") -raw_forward_keyword -> Keyword - = v:raw_keyword {? if v.is_forward() { Ok(v) } else { Err("expected :forward/keyword") } } +raw_forward_namespaced_keyword -> Keyword + = v:raw_namespaced_keyword {? if v.is_forward() { Ok(v) } else { Err("expected namespaced :forward/keyword") } } -raw_backward_keyword -> Keyword - = v:raw_keyword {? if v.is_backward() { Ok(v) } else { Err("expected :backward/_keyword") } } +raw_backward_namespaced_keyword -> Keyword + = v:raw_namespaced_keyword {? if v.is_backward() { Ok(v) } else { Err("expected namespaced :backward/_keyword") } } entid -> Entid = v:( raw_basedinteger / raw_hexinteger / raw_octalinteger / raw_integer ) { Entid::Entid(v) } - / v:raw_keyword { Entid::Ident(v) } + / v:raw_namespaced_keyword { Entid::Ident(v) } forward_entid -> Entid = v:( raw_basedinteger / raw_hexinteger / raw_octalinteger / raw_integer ) { Entid::Entid(v) } - / v:raw_forward_keyword { Entid::Ident(v) } + / v:raw_forward_namespaced_keyword { Entid::Ident(v) } backward_entid -> Entid - = v:raw_backward_keyword { Entid::Ident(v.to_reversed()) } + = v:raw_backward_namespaced_keyword { Entid::Ident(v.to_reversed()) } lookup_ref -> LookupRef = "(" __ "lookup-ref" __ a:(entid) __ v:(value) __ ")" { LookupRef { a: AttributePlace::Entid(a), v } }