From 7e4c9ba2e02f06fa621ffe24bc0ca046536429ef Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 2 Jul 2022 16:32:00 -0400 Subject: Moved "lux/macro" to "lux/meta/macro". --- stdlib/source/format/lux/data/binary.lux | 7 ++++--- stdlib/source/format/lux/data/text.lux | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'stdlib/source/format') diff --git a/stdlib/source/format/lux/data/binary.lux b/stdlib/source/format/lux/data/binary.lux index 8d31c23cc..761176a3a 100644 --- a/stdlib/source/format/lux/data/binary.lux +++ b/stdlib/source/format/lux/data/binary.lux @@ -22,13 +22,14 @@ ["[0]" set (.only Set)] [array [\\unsafe (.only)]]]] - [macro - ["^" pattern]] [math [number ["n" nat] ["[0]" i64] - ["[0]" frac]]]]] + ["[0]" frac]]] + [meta + [macro + ["^" pattern]]]]] ["[0]" \\unsafe (.only Binary)] ["" \\parser (.only Offset Size Parser)]) diff --git a/stdlib/source/format/lux/data/text.lux b/stdlib/source/format/lux/data/text.lux index 531bd282b..2cbf6d99c 100644 --- a/stdlib/source/format/lux/data/text.lux +++ b/stdlib/source/format/lux/data/text.lux @@ -29,15 +29,15 @@ ["[0]" rev] ["[0]" frac] ["[0]" ratio]]] - [macro - [syntax (.only syntax)] - ["[0]" template]] [meta ["[0]" location] ["[0]" symbol] ["[0]" type] ["[0]" code (.only) - ["<[1]>" \\parser (.only Parser)]]]]]) + ["<[1]>" \\parser (.only Parser)]] + [macro + [syntax (.only syntax)] + ["[0]" template]]]]]) (.type .public (Format a) (-> a Text)) -- cgit v1.2.3