summary refs log tree commit diff stats
path: root/compiler/semmacrosanity.nim
Commit message (Expand)AuthorAgeFilesLines
* make tests green againAraq2018-08-131-1/+1
* more modules compile againAndreas Rumpf2018-05-121-18/+18
* introduce nkTupleConstr AST node for unary tuple construction; breaking changeAndreas Rumpf2018-04-131-1/+1
* deprecated unary '<'Andreas Rumpf2017-10-291-2/+2
* removed tyArrayConstr completely from the compiler; introduced tyAlias instea...Araq2016-11-141-1/+1
* fixes #4207Andreas Rumpf2016-06-011-6/+10
* VM produces objects.Yuriy Glukhov2015-09-051-8/+10
* fixes #2603Araq2015-04-261-4/+4
* Happy new year!Guillaume Gelin2015-01-061-1/+1
* Nimrod renamed to NimAraq2014-08-281-1/+1
* renamefestAraq2014-08-231-1/+1
* better testerAraq2014-01-171-2/+2
* better html generator for the tester; fixes some VM bugsAraq2014-01-171-0/+89
garam <vc@akkartik.com> 2022-05-25 12:59:12 -0700 couple more tests' href='/akkartik/text.love/commit/main.lua?id=fa103ca2e8674dd389888d77f9ef60f361a0c704'>fa103ca ^
3af3257 ^



d4daac4 ^
eaa3820 ^
3af3257 ^

eaa3820 ^








58ce23d ^

eaa3820 ^








45eee7a ^
c0df6f8 ^












eaa3820 ^
7fd3c92 ^

de495ae ^

eaa3820 ^
9ade4d2 ^
6809990 ^
5d139f4 ^
64072bf ^
fa103ca ^
















442133f ^



254ae7a ^
34f9670 ^
9ade4d2 ^
34f9670 ^
9ade4d2 ^
45eee7a ^
cfdd563 ^
c0df6f8 ^
b586c73 ^
cfdd563 ^

9ade4d2 ^
f421e1d ^
254ae7a ^
51eb86c ^
f421e1d ^
9ade4d2 ^
8f06b74 ^
45eee7a ^
662096d ^
45eee7a ^
cfdd563 ^
c0df6f8 ^
b586c73 ^
cfdd563 ^

9ade4d2 ^
8f06b74 ^

f421e1d ^
dc618a4 ^
51eb86c ^
8aa72be ^
51eb86c ^
f91e520 ^


815c4f0 ^
6a5864e ^
e581a2b ^
40b1780 ^
e581a2b ^
8aa72be ^
e0b2c2d ^
c0df6f8 ^

f91e520 ^
6a5864e ^
f91e520 ^



c0df6f8 ^

f91e520 ^

c0df6f8 ^
5f2ef2f ^
f91e520 ^
5816956 ^
f91e520 ^
6a5864e ^

d482694 ^
6a5864e ^
f91e520 ^
e581a2b ^
6a5864e ^
1e63bf0 ^
5816956 ^
e581a2b ^
f91e520 ^
475bbd7 ^
51eb86c ^
1e63bf0 ^
a9398e4 ^
51eb86c ^

f421e1d ^
c1ba40a ^
475bbd7 ^

f421e1d ^
6e152a9 ^
3a9f02c ^
40b1780 ^
e2d4edb ^
92bd683 ^
d4daac4 ^
e2d4edb ^

92bd683 ^

3a9f02c ^


e83f219 ^

f421e1d ^
4818672 ^
eaa3820 ^

f421e1d ^
bb9e23a ^









f421e1d ^
222a11a ^

b544e8c ^




9a18b09 ^





bb9e23a ^















f91e520 ^
c0df6f8 ^
1e63bf0 ^
8d5ac5d ^
c0df6f8 ^

ec410d5 ^
6b10c94 ^
f91e520 ^

b3251b2 ^









f91e520 ^
b3251b2 ^
f91e520 ^
b3251b2 ^
c0df6f8 ^
b3251b2 ^
ec410d5 ^
b3251b2 ^
222a11a ^

ccf7ecc ^


f421e1d ^
4aa2003 ^
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
                           

             
              
 
                  
              
                
                           
                                 


                           
 

                                   



                                     
                                                                                                             
                             

                                                            








                                                                                                                         

                                                           








                                                                                              
                                












                                                                                                                        
 

                                       

                             
 
          
 
                                                           
 
















                                                                        



                                                                  
                            
                  
                     
     
                                  
                                
                               
                      
           

       
                                                      
 
                      
 
                              
                               
                
                              
              
                                
                               
                      
           

       
                                                      

   
                   
                      
                                 
                                                                                
                                 


                                         
                                                                                                                  
              
                      
                                         
                                           
                                                                 
                  

                                          
                                                     
                  



                                                                                                                        

                                                         

                          
                                            
                                   
             
                                                   
                                        

                           
                          
                                                      
          
                         
                  
                                                                       
                                                   
                            
         
       
     
                                                                                                               
                

   
                       
                    

   
                                            
                                                 
 
                                         
                               
                                     
                                                

                                      

                                                


         

   
                                       
                                     

   
                         









                                                          
                                    

                                                          




                                                          





                                                              















                                                            
                                 
                                          
                                        
                                                                  

                                   
                                                                                
                                          

                                          









                                                                      
         
                                            
       
                                
                                   
                                 
                                                                                
                                                                           

                                


     
                                       
   
local utf8 = require 'utf8'

require 'app'
require 'test'

require 'keychord'
require 'file'
require 'button'
local Text = require 'text'
local Drawing = require 'drawing'
local geom = require 'geom'
require 'help'
require 'icons'

-- run in both tests and a real run
function App.initialize_globals()
-- a line is either text or a drawing
-- a text is a table with:
--    mode = 'text'
--    string data
--    screen_line_starting_pos: optional array of grapheme indices if it wraps over more than one screen line
-- a drawing is a table with:
--    mode = 'drawing'
--    a (y) coord in pixels (updated while painting screen),
--    a (h)eight,
--    an array of points, and
--    an array of shapes
-- a shape is a table containing:
--    a mode
--    an array points for mode 'freehand' (raw x,y coords; freehand drawings don't pollute the points array of a drawing)
--    an array vertices for mode 'polygon', 'rectangle', 'square'
--    p1, p2 for mode 'line'
--    p1, p2, arrow-mode for mode 'arrow-line'
--    center, radius for mode 'circle'
--    center, radius, start_angle, end_angle for mode 'arc'
-- Unless otherwise specified, coord fields are normalized; a drawing is always 256 units wide
-- The field names are carefully chosen so that switching modes in midstream
-- remembers previously entered points where that makes sense.
--
-- Open question: how to maintain Sketchpad-style constraints? Answer for now:
-- we don't. Constraints operate only for the duration of a drawing operation.
-- We'll continue to persist them just to keep the option open to continue
-- solving for them. But for now, this is a program to create static drawings
-- once, and read them passively thereafter.
Lines = {{mode='text', data=''}}

-- Lines can be too long to fit on screen, in which case they _wrap_ into
-- multiple _screen lines_.
--
-- Therefore, any potential location for the cursor can be described in two ways:
-- * schema 1: As a combination of line index and position within a line (in utf8 codepoint units)
-- * schema 2: As a combination of line index, screen line index within the line, and a position within the screen line.
--
-- Most of the time we'll only persist positions in schema 1, translating to
-- schema 2 when that's convenient.
Cursor1 = {line=1, pos=1}  -- position of cursor
Screen_top1 = {line=1, pos=1}  -- position of start of screen line at top of screen
Screen_bottom1 = {line=1, pos=1}  -- position of start of screen line at bottom of screen

Cursor_x, Cursor_y = 0, 0  -- in pixels

Current_drawing_mode = 'line'
Previous_drawing_mode = nil

Zoom = 1.5

Filename = love.filesystem.getUserDirectory()..'/lines.txt'

end  -- App.initialize_globals

function App.initialize(arg)
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)

  -- maximize window
  love.window.setMode(0, 0)  -- maximize
  App.screen.width, App.screen.height = love.window.getMode()
  -- shrink slightly to account for window decoration
  App.screen.width = App.screen.width-100
  App.screen.height = App.screen.height-100
  love.window.setMode(App.screen.width, App.screen.height)
--?   App.screen.width = 120
--?   App.screen.height = 200
--?   love.window.setMode(App.screen.width, App.screen.height)

  -- maximum width available to either text or drawings, in pixels
  Line_width = math.floor(App.screen.width/2/40)*40
--?   Line_width = 100

  -- still in App.initialize
  if #arg > 0 then
    Filename = arg[1]
  end
  Lines = load_from_disk(Filename)
  for i,line in ipairs(Lines) do
    if line.mode == 'text' then
      Cursor1.line = i
      break
    end
  end
  love.window.setTitle('Text with Lines - '..Filename)

end  -- App.initialize

function App.filedropped(file)
  Filename = file:getFilename()
  file:open('r')
  Lines = load_from_file(file)
  file:close()
  for i,line in ipairs(Lines) do
    if line.mode == 'text' then
      Cursor1.line = i
      break
    end
  end
  love.window.setTitle('Text with Lines - '..Filename)
end

function App.draw()
  Button_handlers = {}
  love.graphics.setColor(1, 1, 1)
  love.graphics.rectangle('fill', 0, 0, App.screen.width-1, App.screen.height-1)
  love.graphics.setColor(0, 0, 0)
  for line_index,line in ipairs(Lines) do
    line.y = nil
  end
  assert(Screen_top1.line < Cursor1.line or (Screen_top1.line == Cursor1.line and Screen_top1.pos <= Cursor1.pos))
  local y = 15
--?   print('== draw')
  for line_index,line in ipairs(Lines) do
--?     print('draw:', y, line_index, line)
    if y + math.floor(15*Zoom) > App.screen.height then break end
--?     print('a')
    if line_index >= Screen_top1.line then
      Screen_bottom1.line = line_index
      if line.mode == 'text' and line.data == '' then
        line.y = y
        button('draw', {x=4,y=y+4, w=12,h=12, color={1,1,0},
          icon = icon.insert_drawing,
          onpress1 = function()
                       table.insert(Lines, line_index, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})
                       if Cursor1.line >= line_index then
                         Cursor1.line = Cursor1.line+1
                       end
                     end})
          if line_index == Cursor1.line then
            Text.draw_cursor(25, y)
          end
        y = y + math.floor(15*Zoom)  -- text height
      elseif line.mode == 'drawing' then
        y = y+10 -- padding
        line.y = y
        Drawing.draw(line)
        y = y + Drawing.pixels(line.h) + 10 -- padding
      else
--?         print('text')
        line.y = y
        y, Screen_bottom1.pos = Text.draw(line, Line_width, line_index)
        y = y + math.floor(15*Zoom)  -- text height
--?         print('=> y', y)
      end
    end
  end
--?   print('screen bottom: '..tostring(Screen_bottom1.pos)..' in '..tostring(Lines[Screen_bottom1.line].data))
--?   os.exit(1)
end

function App.update(dt)
  Drawing.update(dt)
end

function App.mousepressed(x,y, mouse_button)
  propagate_to_button_handlers(x,y, mouse_button)

  for line_index,line in ipairs(Lines) do
    if line.mode == 'text' then
      if Text.in_line(line, x,y) then
        Text.move_cursor(line_index, line, x, y)
      end
    elseif line.mode == 'drawing' then
      if Drawing.in_drawing(line, x, y) then
        Drawing.mouse_pressed(line, x,y, button)
      end
    end
  end
end

function App.mousereleased(x,y, button)
  Drawing.mouse_released(x,y, button)
end

function App.textinput(t)
  if Current_drawing_mode == 'name' then
    local drawing = Lines.current
    local p = drawing.points[drawing.pending.target_point]
    p.name = p.name..t
  else
    Text.textinput(t)
  end
  save_to_disk(Lines, Filename)
end

function App.keychord_pressed(chord)
  if love.mouse.isDown('1') or chord:sub(1,2) == 'C-' then
    Drawing.keychord_pressed(chord)
  elseif chord == 'escape' and love.mouse.isDown('1') then
    local drawing = Drawing.current_drawing()
    if drawing then
      drawing.pending = {}
    end
  elseif chord == 'escape' and not love.mouse.isDown('1') then
    for _,line in ipairs(Lines) do
      if line.mode == 'drawing' then
        line.show_help = false
      end
    end
  elseif Current_drawing_mode == 'name' then
    if chord == 'return' then
      Current_drawing_mode = Previous_drawing_mode
      Previous_drawing_mode = nil
    else
      local drawing = Lines.current
      local p = drawing.points[drawing.pending.target_point]
      if chord == 'escape' then
        p.name = nil
      elseif chord == 'backspace' then
        local len = utf8.len(p.name)
        local byte_offset = utf8.offset(p.name, len-1)
        p.name = string.sub(p.name, 1, byte_offset)
      end
    end
    save_to_disk(Lines, Filename)
  elseif chord == 'pagedown' then
    Screen_top1.line = Screen_bottom1.line
    Screen_top1.pos = Screen_bottom1.pos
--?     print('setting top to', Screen_top1.line, Screen_top1.pos)
    Cursor1.line = Screen_top1.line
    Cursor1.pos = Screen_top1.pos
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary()
--?     print('top now', Screen_top1.line)
  elseif chord == 'pageup' then
    -- duplicate some logic from love.draw
    local top2 = Text.to2(Screen_top1)
--?     print(App.screen.height)
    local y = App.screen.height - math.floor(15*Zoom)
    while y >= 15 do
--?       print(y, top2.line)
      if Screen_top1.line == 1 and Screen_top1.pos == 1 then break end
      if Lines[Screen_top1.line].mode == 'text' then
        y = y - math.floor(15*Zoom)
      elseif Lines[Screen_top1.line].mode == 'drawing' then
        y = y - 20 - Drawing.pixels(Lines[Screen_top1.line].h)
      end
      top2 = Text.previous_screen_line(top2)
    end
    Screen_top1 = Text.to1(top2)
    Cursor1.line = Screen_top1.line
    Cursor1.pos = Screen_top1.pos
    Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary()
--?     print(Cursor1.line, Cursor1.pos, Screen_top1.line, Screen_top1.pos)
  else
    Text.keychord_pressed(chord)
  end
end

function App.keyreleased(key, scancode)
end