Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/artem/seqn-doc-fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
mariari committed Oct 11, 2023
2 parents e631a2b + 8d8cf6c commit 7249deb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
4 changes: 1 addition & 3 deletions src/seqn/package.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
(:mix #:geb.mixins #:geb.generics #:geb.spec
#:geb.extension.spec #:geb.seqn.spec
#:serapeum #:common-lisp)
(:export #:@seqn-api)))
(:export :cod :dom #:@seqn-api)))

(in-package :geb.seqn.main)

Expand All @@ -20,9 +20,7 @@
(inj-coprod-parallel pax:function)
(zero-list pax:function)
(dom (pax:method () (<seqn>)))
(dom (pax:generic-function))
(cod (pax:method () (<seqn>)))
(cod (pax:generic-function))
(well-defp-cat (pax:method () (<seqn>)))
(gapply (pax:method () (<seqn> t))))

Expand Down
21 changes: 13 additions & 8 deletions src/specs/extension.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ of natural numbers"))
number [NUM] and produces an object standing for cardinality
2^([NUM]) corresponding to [NUM]-wide bit number.
The formal grammar of [NAT-WIDTH][NAT-WIDTH class] is
The formal grammar of [NAT-WIDTH][class] is
```lisp
(nat-width num)
Expand All @@ -99,7 +99,7 @@ are to consder."))
((num :initarg :num
:accessor num
:documentation ""))
(:documentation "Given a natural number [NAT] greater than 0, gives a morphsm
(:documentation "Given a natural number [NUM] greater than 0, gives a morphsm
(nat-add num) : (nat-mod num) x (nat-mod num) -> (nat-mod num) representing
floored addition of two bits of length n.
Expand All @@ -113,7 +113,7 @@ The formal grammar of [NAT-ADD][class] is
((num :initarg :num
:accessor num
:documentation ""))
(:documentation "Given a natural number [NAT] greater than 0, gives a morphsm
(:documentation "Given a natural number [NUM] greater than 0, gives a morphsm
(nat-mult num) : (nat-mod num) x (nat-mod num) -> (nat-mod n) representing floored
multiplication in natural numbers modulo n.
Expand All @@ -127,11 +127,11 @@ The formal grammar of [NAT-MULT][class] is
((num :initarg :num
:accessor num
:documentation ""))
(:documentation "Given a natural number [NAT] greater than 0, gives a morphsm
(:documentation "Given a natural number [NUM] greater than 0, gives a morphsm
(nat-sub sum) : (nat-mod num) x (nat-mod num) -> (nat-mod num) representing
floored subtraction of two bits of length n.
The formal grammar of [NAT-SUB][class] isy
The formal grammar of [NAT-SUB][class] is
```lisp
(nat-sub num)
Expand All @@ -141,7 +141,7 @@ The formal grammar of [NAT-SUB][class] isy
((num :initarg :num
:accessor num
:documentation ""))
(:documentation "Given a natural number [NAT] greater than 0, gives a morphsm
(:documentation "Given a natural number [NUM] greater than 0, gives a morphsm
(nat-div num) : (nat-mod num) x (nat-mod num) -> (nat-mod num) representing
floored division in natural numbers modulo n.
Expand Down Expand Up @@ -173,8 +173,8 @@ The formal grammar of [NAT-ADD][class] is
((num :initarg :num
:accessor num
:documentation ""))
(:documentation "Given a nutural number [NAT] presents a [NAT]-wide bit number
as a ([NAT] + 1)-wide bit number via injecting.
(:documentation "Given a nutural number [NUM] presents a [NUM]-wide bit number
as a ([NUM] + 1)-wide bit number via injecting.
The formal grammar of [NAT-INJ][class] is
Expand Down Expand Up @@ -284,6 +284,11 @@ which evaluated to true iff the first input is less than the second"))
(defun nat-lt (num)
(make-instance 'nat-lt :num num))

(defgeneric num (obj))
(defgeneric pos (obj))
(defgeneric num-left (obj))
(defgeneric num-right (obj))




Expand Down

0 comments on commit 7249deb

Please sign in to comment.