From 02d27daeacac74785c2b0f4d1ce03d432377a36e Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 29 Dec 2020 23:29:54 -0400 Subject: Unified repository abstraction for Aedifex. --- lux-jvm/source/luxc/lang/directive/jvm.lux | 9 +++++---- lux-jvm/source/luxc/lang/host/jvm/def.lux | 5 +++-- lux-jvm/source/luxc/lang/host/jvm/inst.lux | 11 ++++++----- lux-jvm/source/luxc/lang/translation/jvm/case.lux | 5 +++-- lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux | 5 +++-- lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux | 5 +++-- lux-jvm/source/luxc/lang/translation/jvm/function.lux | 7 ++++--- lux-jvm/source/luxc/lang/translation/jvm/loop.lux | 5 +++-- lux-jvm/source/luxc/lang/translation/jvm/primitive.lux | 2 +- lux-jvm/source/luxc/lang/translation/jvm/runtime.lux | 4 ++-- lux-jvm/source/luxc/lang/translation/jvm/structure.lux | 7 ++++--- 11 files changed, 37 insertions(+), 28 deletions(-) (limited to 'lux-jvm/source/luxc') diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux index f73182c03..0d258fd5a 100644 --- a/lux-jvm/source/luxc/lang/directive/jvm.lux +++ b/lux-jvm/source/luxc/lang/directive/jvm.lux @@ -6,19 +6,20 @@ ["." monad (#+ do)]] [control ["." try (#+ Try)]] - [target - ["/" jvm]] [data [identity (#+ Identity)] ["." product] - [number - ["." nat]] [text ["%" format (#+ format)]] [collection ["." list ("#@." fold)] ["." dictionary (#+ Dictionary)] ["." row (#+ Row) ("#@." functor fold)]]] + [math + [number + ["." nat]]] + [target + ["/" jvm]] [tool [compiler ["." phase] diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux index 12e2fe412..212d9d854 100644 --- a/lux-jvm/source/luxc/lang/host/jvm/def.lux +++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux @@ -5,13 +5,14 @@ ["." function]] [data ["." product] - [number - ["i" int]] ["." text ["%" format (#+ format)]] [collection ["." array (#+ Array)] ["." list ("#@." functor)]]] + [math + [number + ["i" int]]] [target [jvm [encoding diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux index 341ded0e4..1f9e93c71 100644 --- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux +++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux @@ -11,15 +11,16 @@ [data ["." product] ["." maybe] - [number - ["n" nat] - ["i" int]] [collection ["." list ("#@." functor)]]] [macro + [syntax (#+ syntax:)] ["." code] - ["." template] - [syntax (#+ syntax:)]] + ["." template]] + [math + [number + ["n" nat] + ["i" int]]] [target [jvm [encoding diff --git a/lux-jvm/source/luxc/lang/translation/jvm/case.lux b/lux-jvm/source/luxc/lang/translation/jvm/case.lux index b9d6ec6d1..f3bbb2a1c 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/case.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/case.lux @@ -6,10 +6,11 @@ ["." function] ["ex" exception (#+ exception:)]] [data - [number - ["n" nat]] [collection ["." list ("#@." fold)]]] + [math + [number + ["n" nat]]] [target [jvm ["." type (#+ Type) diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux index ff56c7824..add0eefcc 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux @@ -8,11 +8,12 @@ ["" synthesis (#+ Parser)]]] [data ["." product] - [number - ["f" frac]] [collection ["." list ("#@." monad)] ["." dictionary]]] + [math + [number + ["f" frac]]] [target [jvm ["." type]]] diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux index d83a6d841..c3c522bfa 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux @@ -14,12 +14,13 @@ ["." maybe ("#@." functor)] ["." text ("#@." equivalence) ["%" format (#+ format)]] - [number - ["." nat]] [collection ["." list ("#@." monad)] ["." dictionary (#+ Dictionary)] ["." set]]] + [math + [number + ["." nat]]] [target [jvm ["." type (#+ Type Typed Argument) diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux index 0fe7717fb..6c03bd482 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux @@ -10,11 +10,12 @@ ["." product] [text ["%" format (#+ format)]] - [number - ["n" nat] - ["i" int]] [collection ["." list ("#@." functor monoid)]]] + [math + [number + ["n" nat] + ["i" int]]] [target [jvm ["." type (#+ Type) diff --git a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux index 4b44561c7..5ad997539 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux @@ -5,10 +5,11 @@ [control ["." function]] [data - [number - ["n" nat]] [collection ["." list ("#@." functor monoid)]]] + [math + [number + ["n" nat]]] [tool [compiler ["." phase] diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux index 2d8bff828..b42f63c4d 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux @@ -1,7 +1,7 @@ (.module: [lux (#- i64) ["." host (#+ import:)] - [data + [math [number ["i" int]]] [target diff --git a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux index 061972df1..782187339 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux @@ -10,10 +10,10 @@ ["%" format (#+ format)]] [collection ["." list ("#@." functor)] - ["." row]] + ["." row]]] + ["." math [number ["n" nat]]] - ["." math] [target [jvm ["." type (#+ Type) diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux index a93b4845f..b3daed102 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux @@ -6,13 +6,14 @@ [control ["." exception (#+ exception:)]] [data - [number - ["n" nat] - ["i" int]] [text ["%" format (#+ format)]] [collection ["." list]]] + [math + [number + ["n" nat] + ["i" int]]] [target [jvm ["." type (#+ Type) -- cgit v1.2.3