suzanne.soy/remix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comments

Browse Source
This commit is contained in:
Jay McCarthy 2015-12-30 19:06:46 -05:00
parent 726e55f093
commit b4bf176110
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
remix/data0.rkt
View File

@ -35,16 +35,18 @@
(define-syntax (phase1:static-interface stx) (define-syntax (phase1:static-interface stx)
(syntax-parse stx (syntax-parse stx
#:literals (remix:#%brackets) #:literals (remix:#%brackets)
[(_si (remix:#%brackets [(_si
lhs:interface-member rhs:id ;; XXX make expandable position
(~optional (remix:#%brackets
(~seq #:is rhs-dt:id) lhs:interface-member rhs:id
#:defaults ([rhs-dt #'#f]))) (~optional
... (~seq #:is rhs-dt:id)
(~optional #:defaults ([rhs-dt #'#f])))
(~seq #:extensions ...
extension ...) (~optional
#:defaults ([[extension 1] '()]))) (~seq #:extensions
extension ...)
#:defaults ([[extension 1] '()])))
(with-syntax* ([int-name (or (syntax-local-name) 'static-interface)] (with-syntax* ([int-name (or (syntax-local-name) 'static-interface)]
[(def-rhs ...) [(def-rhs ...)
(for/list ([lhs (in-list (for/list ([lhs (in-list
@ -246,6 +248,7 @@
(~optional (~and (~seq #:rep (~var rep (static layout-planner? (~optional (~and (~seq #:rep (~var rep (static layout-planner?
"layout planner")))) "layout planner"))))
#:defaults ([rep #f])) #:defaults ([rep #f]))
;; XXX make expandable position
F:field ...) F:field ...)
(define parent-v (attribute parent-va)) (define parent-v (attribute parent-va))
(define this-rep-id (attribute rep)) (define this-rep-id (attribute rep))
@ -436,10 +439,15 @@
[(define (def-transform _ stx) [(define (def-transform _ stx)
(syntax-parse stx (syntax-parse stx
#:literals (remix:#%brackets remix:def theory) #:literals (remix:#%brackets remix:def theory)
;; XXX support parameters
[(remix:def (remix:#%brackets theory thy:id) [(remix:def (remix:#%brackets theory thy:id)
;; XXX support properties
;; XXX make expandable position
v:id ...) v:id ...)
(syntax/loc stx (syntax/loc stx
(remix:def (remix:#%brackets phase0:layout thy) (remix:def (remix:#%brackets phase0:layout thy)
;; XXX add a property for theories
;; XXX support defaults
v ...))]))])) v ...))]))]))
(define-syntax model (define-syntax model
@ -452,7 +460,12 @@
(syntax-parse stx (syntax-parse stx
#:literals (remix:#%brackets remix:def model) #:literals (remix:#%brackets remix:def model)
[(remix:def (remix:#%brackets model thy:id mod:id) [(remix:def (remix:#%brackets model thy:id mod:id)
;; XXX make expandable position
(remix:#%brackets f:id v:expr) ...) (remix:#%brackets f:id v:expr) ...)
;; XXX support verification of properties
;; XXX support theory parameters
;; XXX check that thy is a theory
;; XXX check that f is complete and apply defaults if not
(syntax/loc stx (syntax/loc stx
(remix:def (remix:#%brackets thy mod) (remix:def (remix:#%brackets thy mod)
(remix:#%app (remix:#%app
@ -463,4 +476,5 @@
model) model)
;; xxx (dynamic-)interface ;; xxx (dynamic-)interface
;; xxx class
;; xxx data ;; xxx data

6
remix/tests/simple.rkt
View File

@ -512,10 +512,8 @@ def x4
;; Theories & Models ;; Theories & Models
;; A theory is a specification of some values ;; A theory is a specification of some values
;; XXX add parameters
(def [theory Monoid] (def [theory Monoid]
op id) op id)
;; XXX specify properties
(module+ test (module+ test
;; You can write generic functions over a theory. This imposes a ;; You can write generic functions over a theory. This imposes a
;; single constant cost to access the operations (basically, a ;; single constant cost to access the operations (basically, a
@ -528,7 +526,6 @@ def x4
(def [model Monoid Monoid-Nat:+] (def [model Monoid Monoid-Nat:+]
[op +] [op +]
[id 0]) [id 0])
;; XXX verify properties
(def [model Monoid Monoid-Nat:*] (def [model Monoid Monoid-Nat:*]
[op *] [op *]
@ -542,3 +539,6 @@ def x4
;; we can imagine it might be inlinable. ;; we can imagine it might be inlinable.
{((Monoid-Nat:+.op) 6 Monoid-Nat:+.id) ≡ Monoid-Nat:+.(op Monoid-Nat:+.id 6)}) {((Monoid-Nat:+.op) 6 Monoid-Nat:+.id) ≡ Monoid-Nat:+.(op Monoid-Nat:+.id 6)})
;; Interfaces & Class
(def [interface ])