about summary refs log tree commit diff stats
path: root/subx/opcodes
Commit message (Collapse)AuthorAgeFilesLines
* 4712Kartik Agaram2018-10-211-89/+92
|
* 4671Kartik Agaram2018-10-071-0/+1
|
* 4578 - subx: implement inc/dec operationsKartik Agaram2018-09-211-1/+17
|
* 4571Kartik Agaram2018-09-211-66/+74
|
* 3968Kartik K. Agaram2017-07-111-0/+66
ter Kartik K. Agaram <vc@akkartik.com> 2016-12-11 16:18:18 -0800 3705 - switch to tested file-system primitives' href='/akkartik/mu/commit/edit/008-sandbox-edit.mu?h=hlt&id=294b2ab35983ebe95698835bb54bca8bd3eec101'>294b2ab3 ^
6d12a8c4 ^
a90faae9 ^
a90faae9 ^


294b2ab3 ^
a90faae9 ^
dd30f56d ^
71056d61 ^
294b2ab3 ^
898f03cc ^
294b2ab3 ^

ceeb92d4 ^
71056d61 ^
a90faae9 ^
09b8717b ^
a90faae9 ^
02a35f22 ^


294b2ab3 ^
02a35f22 ^



294b2ab3 ^

71056d61 ^
02a35f22 ^





294b2ab3 ^
02a35f22 ^


294b2ab3 ^

71056d61 ^
02a35f22 ^


294b2ab3 ^
6f65d591 ^
02a35f22 ^

294b2ab3 ^



6d12a8c4 ^
02a35f22 ^
02a35f22 ^


294b2ab3 ^
02a35f22 ^

71056d61 ^
294b2ab3 ^
898f03cc ^
294b2ab3 ^

ceeb92d4 ^
71056d61 ^
02a35f22 ^
09b8717b ^
02a35f22 ^
898f03cc ^
a90faae9 ^

294b2ab3 ^
a90faae9 ^


dd30f56d ^
294b2ab3 ^

71056d61 ^
a90faae9 ^





294b2ab3 ^
a90faae9 ^

dd30f56d ^
294b2ab3 ^

71056d61 ^
a90faae9 ^



09b8717b ^
a90faae9 ^
3d8b137c ^
09b8717b ^


4e7186fa ^
ea5e7fd4 ^
ada5eb55 ^
a90faae9 ^


09b8717b ^
2d91279b ^
02a35f22 ^
4a48bedc ^
09b8717b ^
3d8b137c ^
dd660682 ^
09b8717b ^
2d91279b ^
09b8717b ^
3d8b137c ^



dd660682 ^
09b8717b ^
2d91279b ^
09b8717b ^
a90faae9 ^

2d91279b ^
a90faae9 ^
4a48bedc ^
09b8717b ^
2d91279b ^
dd660682 ^

09b8717b ^
ea19d0dc ^
2d91279b ^
09b8717b ^



a90faae9 ^
dd660682 ^
a90faae9 ^
ae244ebd ^

6f65d591 ^
e00d4854 ^
ae244ebd ^

294b2ab3 ^


ab6e672d ^
6d12a8c4 ^
ae244ebd ^



294b2ab3 ^
ae244ebd ^

71056d61 ^
ceeb92d4 ^
898f03cc ^
ab6e672d ^
71056d61 ^





ceeb92d4 ^
71056d61 ^
ae244ebd ^


02a35f22 ^
ae244ebd ^

294b2ab3 ^
ae244ebd ^


ab6e672d ^
ceeb92d4 ^
71056d61 ^

ae244ebd ^

e0d69d3b ^

6f65d591 ^
e0d69d3b ^
dd30f56d ^
e0d69d3b ^
294b2ab3 ^


6f65d591 ^
e0d69d3b ^






11569717 ^

e0d69d3b ^
294b2ab3 ^
e0d69d3b ^
dd30f56d ^
ceeb92d4 ^
898f03cc ^
71056d61 ^

ceeb92d4 ^
71056d61 ^
e0d69d3b ^


02a35f22 ^
e0d69d3b ^

294b2ab3 ^
e0d69d3b ^


dd30f56d ^
71056d61 ^
ceeb92d4 ^
898f03cc ^
71056d61 ^

ceeb92d4 ^
71056d61 ^
e0d69d3b ^

f140f194 ^

6f65d591 ^
f140f194 ^
dd30f56d ^
f140f194 ^
294b2ab3 ^


6f65d591 ^
f140f194 ^







294b2ab3 ^
f140f194 ^
dd30f56d ^
71056d61 ^
ceeb92d4 ^
898f03cc ^
71056d61 ^

ceeb92d4 ^
898f03cc ^
71056d61 ^

f140f194 ^


02a35f22 ^
f140f194 ^


294b2ab3 ^
f140f194 ^


dd30f56d ^
71056d61 ^
ceeb92d4 ^
898f03cc ^
71056d61 ^

ceeb92d4 ^
898f03cc ^
71056d61 ^

f140f194 ^


11569717 ^


f140f194 ^

294b2ab3 ^
f140f194 ^
dd30f56d ^
f140f194 ^
dd30f56d ^
ceeb92d4 ^
898f03cc ^
71056d61 ^

ceeb92d4 ^
71056d61 ^
f140f194 ^

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325

                                               
                                                             
             
                                       
                                    



                                                                                
                                
          


                  
                                            
                         
                                                                                                          
                                                                                                            
                                                                                                                                                                                                                                                                                                                  
                                                                                                            

                                                                                                            
                                                                                                                                                                                                              
                                                                                                            
   
                                       
                  


                    
                                              



                                                                                                          

                                                                                                                                                                                                                                                                                                                  
                                                                                                            





                                       
                                              


                                                                                                          

                                                                                                                                                                                                                                                                                                                  
                                                                                                            


   
                                                               
             

                                       



                                                                                
                                
          


                  
                                            

                                                                                                          
                                                                                                            
                                                                                                                                                                                                                                                                                                                  
                                                                                                            

                                                                                                            
                                                                                                                                                                                                              
                                                                                                            
   
                                                             
                  
                    

       
                                              


                            
                                                                                                          

                                                                                                                                                                                                                                                                                                                  
                                                                                                            





                                       
                                              

                         
                                                                                                          

                                                                                                                                                                                                                                                                                                                  
                                                                                                            



                      
                         
   
                                                                   


                                                 
                                                     
                                                                                    
                    


   
                                                     
                                                                                            
             
             
                                    
                                                                                 
                                          
                                                                     
                                                            
                            



                                                                                                                  
                                                 
                                     
                                                              
                                         

 
                                                                                                          
             
             
                                                                                
                                                  

                                      
                                                   
                                        
                                                              



                                                      
                                     
                                                  
 

                                           
             
                                       

                                    


                                             
                                                                                       
                                



                   
                                            

                                                                                                          
                                                                                                            
                                                                                                                                                                                                                                                                                                                  
                                                                                                            
                                                                                                            





                                                                                                            
                                                                                                                                                                                                              
                                                                                                            


                    
                    

       
                                              


                                                                                                          
                                                                                                            
                                                                                                                                                                                                                                                                                                                  

                                                                                                            

   

                                                        
             
                                       
                                    
                          


                                                                        
                                






                                           

                   
   
                                            
                         
                                                                                                          
                                                                                                                                                                                                              
                                                                                                                                                                                                                

                                                                                                            
                                                                                                                                                                                                              
                                                                                                            


                           
                    

       
                                              


                                                                          
                                                                                                          
                                                                                                            
                                                                                                                                                                                                                                                                                                                  
                                                                                                            

                                                                                                            
                                                                                                                                                                                                              
                                                                                                            

   

                                                
             
                                       
                                    
                          


                                                                        
                                







                      
                                            
                         
                                                                                                          
                                                                                                            
                                                                                                                                                                                                                                                                                                                  
                                                                                                            

                                                                                                            
                                                                                                                                                                                                              
                                                                                                            

                                                                                                            


                                        
                    


            
                                              


                         
                                                                                                          
                                                                                                            
                                                                                                                                                                                                                                                                                                                  
                                                                                                            

                                                                                                            
                                                                                                                                                                                                              
                                                                                                            

                                                                                                            


                              


                   

       
                                              
   
                                                                  
                         
                                                                                                          
                                                                                                                                                                                                              
                                                                                                                                                                                                                

                                                                                                            
                                                                                                                                                                                                              
                                                                                                            

   
## editing sandboxes after they've been created

scenario clicking-on-sandbox-edit-button-moves-it-to-editor [
  local-scope
  trace-until 100/app  # trace too long
  assume-screen 100/width, 10/height
  # empty recipes
  assume-resources [
  ]
  env:&:environment <- new-programming-environment resources, screen, [add 2, 2]
  render-all screen, env, render
  # run it
  assume-console [
    press F4
  ]
  event-loop screen, console, env, resources
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                                                                   .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                  0   edit       copy       to recipe    delete    .
    .                                                  add 2, 2                                         .
    .                                                  4                                                .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
  # click at left edge of 'edit' button
  assume-console [
    left-click 3, 55
  ]
  run [
    event-loop screen, console, env, resources
  ]
  # it pops back into editor
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  add 2, 2                                         .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
  # cursor should be in the right place
  assume-console [
    type [0]
  ]
  run [
    event-loop screen, console, env, resources
  ]
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  0add 2, 2                                        .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
]

scenario clicking-on-sandbox-edit-button-moves-it-to-editor-2 [
  local-scope
  trace-until 100/app  # trace too long
  assume-screen 100/width, 10/height
  # empty recipes
  assume-resources [
  ]
  env:&:environment <- new-programming-environment resources, screen, [add 2, 2]
  render-all screen, env, render
  # run it
  assume-console [
    press F4
  ]
  event-loop screen, console, env, resources
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                                                                   .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                  0   edit       copy       to recipe    delete    .
    .                                                  add 2, 2                                         .
    .                                                  4                                                .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
  # click at right edge of 'edit' button (just before 'copy')
  assume-console [
    left-click 3, 65
  ]
  run [
    event-loop screen, console, env, resources
  ]
  # it pops back into editor
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  add 2, 2                                         .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
  # cursor should be in the right place
  assume-console [
    type [0]
  ]
  run [
    event-loop screen, console, env, resources
  ]
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  0add 2, 2                                        .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
]

after <global-touch> [
  # support 'edit' button
  {
    edit?:bool <- should-attempt-edit? click-row, click-column, env
    break-unless edit?
    edit?, env <- try-edit-sandbox click-row, env
    break-unless edit?
    screen <- render-sandbox-side screen, env, render
    screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env
    loop +next-event
  }
]

# some preconditions for attempting to edit a sandbox
def should-attempt-edit? click-row:num, click-column:num, env:&:environment -> result:bool [
  local-scope
  load-inputs
  # are we below the sandbox editor?
  click-sandbox-area?:bool <- click-on-sandbox-area? click-row, click-column, env
  return-unless click-sandbox-area?, false
  # narrower, is the click in the columns spanning the 'edit' button?
  first-sandbox:&:editor <- get *env, current-sandbox:offset
  assert first-sandbox, [!!]
  sandbox-left-margin:num <- get *first-sandbox, left:offset
  sandbox-right-margin:num <- get *first-sandbox, right:offset
  edit-button-left:num, edit-button-right:num, _ <- sandbox-menu-columns sandbox-left-margin, sandbox-right-margin
  edit-button-vertical-area?:bool <- within-range? click-column, edit-button-left, edit-button-right
  return-unless edit-button-vertical-area?, false
  # finally, is sandbox editor empty?
  current-sandbox:&:editor <- get *env, current-sandbox:offset
  result <- empty-editor? current-sandbox
]

def try-edit-sandbox click-row:num, env:&:environment -> clicked-on-edit-button?:bool, env:&:environment [
  local-scope
  load-inputs
  # identify the sandbox to edit, if the click was actually on the 'edit' button
  sandbox:&:sandbox <- find-sandbox env, click-row
  return-unless sandbox, false
  clicked-on-edit-button? <- copy true
  # 'edit' button = 'copy' button + 'delete' button
  text:text <- get *sandbox, data:offset
  current-sandbox:&:editor <- get *env, current-sandbox:offset
  current-sandbox <- insert-text current-sandbox, text
  env <- delete-sandbox env, sandbox
  # reset scroll
  *env <- put *env, render-from:offset, -1
  # position cursor in sandbox editor
  *env <- put *env, sandbox-in-focus?:offset, true
]

scenario sandbox-with-print-can-be-edited [
  local-scope
  trace-until 100/app  # trace too long
  assume-screen 100/width, 20/height
  # left editor is empty
  assume-resources [
  ]
  # right editor contains a print instruction
  env:&:environment <- new-programming-environment resources, screen, [print screen, 4]
  render-all screen, env, render
  # run the sandbox
  assume-console [
    press F4
  ]
  event-loop screen, console, env, resources
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                                                                   .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                  0   edit       copy       to recipe    delete    .
    .                                                  print screen, 4                                  .
    .                                                  screen:                                          .
    .                                                    .4                             .               .
    .                                                    .                              .               .
    .                                                    .                              .               .
    .                                                    .                              .               .
    .                                                    .                              .               .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
  # edit the sandbox
  assume-console [
    left-click 3, 65
  ]
  run [
    event-loop screen, console, env, resources
  ]
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  print screen, 4                                  .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                                                                   .
    .                                                                                                   .
  ]
]

scenario editing-sandbox-after-scrolling-resets-scroll [
  local-scope
  trace-until 100/app  # trace too long
  assume-screen 100/width, 10/height
  # initialize environment
  assume-resources [
  ]
  env:&:environment <- new-programming-environment resources, screen, []
  render-all screen, env, render
  # create 2 sandboxes and scroll to second
  assume-console [
    press ctrl-n
    type [add 2, 2]
    press F4
    type [add 1, 1]
    press F4
    press page-down
    press page-down
  ]
  event-loop screen, console, env, resources
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  ┊─────────────────────────────────────────────────.
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊1   edit       copy       to recipe    delete    .
    .                                                  add 2, 2                                         .
    .                                                  4                                                .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
  # edit the second sandbox
  assume-console [
    left-click 2, 55
  ]
  run [
    event-loop screen, console, env, resources
  ]
  # second sandbox shows in editor; scroll resets to display first sandbox
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  add 2, 2                                         .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                  0   edit       copy       to recipe    delete    .
    .                                                  add 1, 1                                         .
    .                                                  2                                                .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
]

scenario editing-sandbox-updates-sandbox-count [
  local-scope
  trace-until 100/app  # trace too long
  assume-screen 100/width, 10/height
  # initialize environment
  assume-resources [
  ]
  env:&:environment <- new-programming-environment resources, screen, []
  render-all screen, env, render
  # create 2 sandboxes
  assume-console [
    press ctrl-n
    type [add 2, 2]
    press F4
    type [add 1, 1]
    press F4
  ]
  event-loop screen, console, env, resources
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                                                                   .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                  0   edit       copy       to recipe    delete    .
    .                                                  add 1, 1                                         .
    .                                                  2                                                .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                  1   edit       copy       to recipe    delete    .
    .                                                  add 2, 2                                         .
    .                                                  4                                                .
  ]
  # edit the second sandbox, then resave
  assume-console [
    left-click 3, 60
    press F4
  ]
  run [
    event-loop screen, console, env, resources
  ]
  # no change in contents
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                                                                   .
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊─────────────────────────────────────────────────.
    .                                                  0   edit       copy       to recipe    delete    .
    .                                                  add 1, 1                                         .
    .                                                  2                                                .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                  1   edit       copy       to recipe    delete    .
    .                                                  add 2, 2                                         .
    .                                                  4                                                .
  ]
  # now try to scroll past end
  assume-console [
    press page-down
    press page-down
    press page-down
  ]
  run [
    event-loop screen, console, env, resources
  ]
  # screen should show just final sandbox with the right index (1)
  screen-should-contain [
    .                                                                                 run (F4)           .
    .                                                  ┊─────────────────────────────────────────────────.
    .┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┊1   edit       copy       to recipe    delete    .
    .                                                  add 2, 2                                         .
    .                                                  4                                                .
    .                                                  ┊─────────────────────────────────────────────────.
    .                                                                                                   .
  ]
]