First stab at FQParser

src/Refinements-Parsing/FQParser.class.st

@@ -21,6 +21,7 @@ FQParser >> bind [
 FQParser >> constraint [
 	^ 'constraint:' asParser trim
 	, subC
+	==> #second
 ]
 
 { #category : #grammar }
@@ -41,21 +42,20 @@ FQParser >> ref: kind [
 "
 -- | (Sorted) Refinements
 "
-	^(self refBind: bind rp: refa kind: kind)
-	==> [ :x | x halt ]
+	^self refBind: bind rp: refa kind: kind
 ]
 
 { #category : #grammar }
 FQParser >> refBind: bp rp: rp kind: kindP [
 "
 -- (Sorted) Refinements with configurable sub-parsers
 "
-	^${ asParser,
+	^(
 		bp trim,
 		kindP trim,
 		'|' asParser trim,
-		rp,
-		$} asParser
+		rp
+	) braces
 	==> [ :x | x second value: (Reft symbol: x first expr: x fourth) ]
 ]
 
@@ -84,12 +84,18 @@ FQParser >> start [
 
 { #category : #grammar }
 FQParser >> subC [
-	^ 'env []' asParser trim
+	^ ('env []' asParser trim ==> [ :_ | IBindEnv empty])
 	, 'lhs' asParser trim, sortedReft trim
 	, 'rhs' asParser trim, sortedReft trim
 	, 'id'  asParser, Character space asParser plus, PPParser decimalNat trim
 	, self tag
-	==> [ :x | x halt ]
+	==> [ :x | SubC
+			mkSubC: x first
+			lhs: x third
+			rhs: x fifth
+			i: x eighth
+			tag: x ninth
+	]
 ]
 
 { #category : #grammar }

src/Refinements/FInfo.class.st

@@ -10,7 +10,7 @@ FInfo class >> defsFInfo: defs [
 defsFInfo :: [Def a] -> FInfo a
 Cf. Parse.hs
 "
-	self shouldBeImplemented.
+	^self basicNew initializeFromDefs: defs
 ]
 
 { #category : #logic }
@@ -26,6 +26,26 @@ FInfo >> convertFormat [
 	^fi′ as: SInfo
 ]
 
+{ #category : #'private - initialization' }
+FInfo >> initializeFromDefs: defs [
+"
+Cf. Parse.hs
+This is inefficient as it walks over defs multiple times,
+but at least textually consistent with LF.
+"
+	self initializeMempty.
+	cm := Dictionary newFromAssociations: (defs select: [ :def | def isKindOf: SubC ] thenCollect: [ :subc | subc id -> subc ]).
+	bs := BindEnv empty.
+	ebinds := #().
+	ws := KVEnv new.
+	quals := OrderedCollection new.
+	gLits := SEnv new.
+	kuts := Kuts new.
+	ddecls := OrderedCollection new.
+	ae := AxiomEnv new.
+	options := QueryOptions new.
+]
+
 { #category : #logic }
 FInfo >> reduce [
 	| simplifiedFi reducedFi |