From 06ef635e8a4cbd17e43561809ed58691da6f18d7 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 28 Nov 2016 00:42:24 -0800 Subject: 3699 Delete some obsolete /same-as-ingredient attributes. We should always let Mu deduce those at this point. --- edit/001-editor.mu | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'edit/001-editor.mu') diff --git a/edit/001-editor.mu b/edit/001-editor.mu index 170468cd..c3e8e6da 100644 --- a/edit/001-editor.mu +++ b/edit/001-editor.mu @@ -73,9 +73,9 @@ def insert-text editor:&:editor, text:text -> editor:&:editor [ local-scope load-ingredients # early exit if text is empty - return-unless text, editor/same-as-ingredient:0 + return-unless text len:num <- length *text - return-unless len, editor/same-as-ingredient:0 + return-unless len idx:num <- copy 0 # now we can start appending the rest, character by character curr:&:duplex-list:char <- get *editor, data:offset @@ -89,7 +89,6 @@ def insert-text editor:&:editor, text:text -> editor:&:editor [ idx <- add idx, 1 loop } - return editor/same-as-ingredient:0 ] scenario editor-initializes-without-data [ @@ -123,7 +122,7 @@ scenario editor-initializes-without-data [ def render screen:&:screen, editor:&:editor -> last-row:num, last-column:num, screen:&:screen, editor:&:editor [ local-scope load-ingredients - return-unless editor, 1/top, 0/left, screen/same-as-ingredient:0, editor/same-as-ingredient:1 + return-unless editor, 1/top, 0/left left:num <- get *editor, left:offset screen-height:num <- screen-height screen right:num <- get *editor, right:offset @@ -218,7 +217,7 @@ def render screen:&:screen, editor:&:editor -> last-row:num, last-column:num, sc *editor <- put *editor, cursor-row:offset, cursor-row *editor <- put *editor, cursor-column:offset, cursor-column *editor <- put *editor, before-cursor:offset, before-cursor - return row, column, screen/same-as-ingredient:0, editor/same-as-ingredient:1 + return row, column ] def clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num -> screen:&:screen [ @@ -228,13 +227,12 @@ def clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num { break-if screen clear-display-from row, column, left, right - return screen/same-as-ingredient:0 + return } # if not, go the slower route screen <- move-cursor screen, row, column clear-line-until screen, right clear-rest-of-screen screen, row, left, right - return screen/same-as-ingredient:0 ] def clear-rest-of-screen screen:&:screen, row:num, left:num, right:num -> screen:&:screen [ -- cgit 1.4.1-2-gfad0 3b3f (plain) (tree) 
b96af395 ^


94fa5c95 ^




b96af395 ^



b3cdcdd4 ^

94fa5c95 ^

b96af395 ^







94fa5c95 ^

9a81d746 ^

b96af395 ^

d1262cd6 ^

49620728 ^

b96af395 ^


94fa5c95 ^

9a81d746 ^

3e1349d2 ^





01ce563d ^


3e1349d2 ^

1ae4e0d9 ^

3e1349d2 ^





b3cdcdd4 ^

a9817844 ^




b96af395 ^







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