@@ -2,8 +2,7 @@ import eyg/analysis/inference/levels_j/contextual as j
2
2
import eyg/analysis/type_/binding
3
3
import eyg/analysis/type_/isomorphic as t
4
4
import eyg/compile
5
- import eyg/parse/lexer
6
- import eyg/parse/parser
5
+ import eyg/parse
7
6
import eyg/runtime/cast
8
7
import eyg/runtime/interpreter/live
9
8
import eyg/runtime/value as v
@@ -35,12 +34,6 @@ pub fn source(state: State) {
35
34
state . source
36
35
}
37
36
38
- fn parse ( src ) {
39
- src
40
- |> lexer . lex ( )
41
- |> parser . parse ( )
42
- }
43
-
44
37
pub fn lines ( source ) {
45
38
list . reverse ( do_lines ( source , 0 , 0 , [ ] ) )
46
39
}
@@ -137,8 +130,8 @@ pub fn highlights(state, spans, acc) {
137
130
}
138
131
139
132
pub fn information ( state ) {
140
- case parse ( source ( state ) ) {
141
- Ok ( tree ) -> {
133
+ case parse . from_string ( source ( state ) ) {
134
+ Ok ( # ( tree , _rest ) ) -> {
142
135
let # ( tree , spans ) = annotated . strip_annotation ( tree )
143
136
let # ( exp , bindings ) = j . infer ( tree , t . Empty , 0 , j . new_state ( ) )
144
137
let acc = annotated . strip_annotation ( exp ) . 1
@@ -169,8 +162,8 @@ pub fn interpret(state) {
169
162
Ok ( v . unit )
170
163
} ) ,
171
164
] )
172
- case parse ( source ( state ) ) {
173
- Ok ( tree ) -> {
165
+ case parse . from_string ( source ( state ) ) {
166
+ Ok ( # ( tree , _rest ) ) -> {
174
167
let # ( r , assignments ) = live . execute ( tree , h )
175
168
let lines = list . map ( lines ( source ( state ) ) , fn ( x ) { # ( x , [ ] ) } )
176
169
let output =
@@ -189,8 +182,8 @@ pub fn interpret(state) {
189
182
}
190
183
191
184
pub fn compile ( state ) {
192
- case parse ( source ( state ) ) {
193
- Ok ( tree ) -> {
185
+ case parse . from_string ( source ( state ) ) {
186
+ Ok ( # ( tree , _rest ) ) -> {
194
187
Ok ( compile . to_js ( tree ) )
195
188
}
196
189
Error ( reason ) -> Error ( reason )
0 commit comments