From 9dcbec398c5aedf27757365cc1f4c7c36e138539 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Fri, 20 May 2016 22:09:06 -0700 Subject: 2990 Standardize quotes around reagents in error messages. I'm still sure there's issues. For example, the messages when type-checking 'copy'. I'm not putting quotes around them because in layer 60 I end up creating dilated reagents, and then it's a bit much to have quotes and (two kinds of) brackets. But I'm sure I'm doing that somewhere.. --- sandbox/011-errors.mu | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) (limited to 'sandbox') diff --git a/sandbox/011-errors.mu b/sandbox/011-errors.mu index 8dfedf96..fc1e99ed 100644 --- a/sandbox/011-errors.mu +++ b/sandbox/011-errors.mu @@ -145,14 +145,9 @@ def foo [ .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. .0 edit copy delete . .foo . - .foo: unknown element foo in container number . + .foo: unknown element 'foo' in container 'number' . .foo: first ingredient of 'get' should be a contai↩. - .ner, but got 123:number . - .foo: unknown element foo in container number . - .foo: first ingredient of 'get' should be a contai↩. - .ner, but got 123:number . - .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. - . . + .ner, but got '123:number' . ] screen-should-contain-in-color 1/red, [ . errors found . @@ -264,7 +259,7 @@ z <- add x, y .0 edit copy delete . .foo 2 . .foo_2: 'add' requires number ingredients, but got↩. - . y . + . 'y' . .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. . . ] @@ -283,7 +278,7 @@ z <- add x, y .0 edit copy delete . .foo 2 . .foo_3: 'add' requires number ingredients, but got↩. - . y . + . 'y' . .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. . . ] @@ -358,12 +353,7 @@ def foo [ .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. .0 edit copy delete . .foo . - .foo: missing type for x in 'x <- copy 0' . - .foo: can't copy 0 to x; types don't match . - .foo: missing type for x in 'x <- copy 0' . - .foo: can't copy 0 to x; types don't match . - .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. - . . + .foo: missing type for 'x' in 'x <- copy 0' . ] ] @@ -372,7 +362,7 @@ scenario run-shows-unbalanced-bracket-errors [ assume-screen 50/width, 20/height # recipe is incomplete (unbalanced '[') 1:address:array:character <- new [ -def foo « +recipe foo « x <- copy 0 ] replace 1:address:array:character, 171/«, 91 # '[' @@ -421,7 +411,7 @@ def foo [ .0 edit copy delete . .foo . .foo: first ingredient of 'get' should be a contai↩. - .ner, but got x:address:point . + .ner, but got 'x:address:point' . ] ] @@ -450,7 +440,7 @@ def foo [ .0 edit copy delete . .foo . .foo: second ingredient of 'get' should have type ↩. - .'offset', but got x:number . + .'offset', but got 'x:number' . ] ] @@ -475,7 +465,7 @@ def foo [ .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. .0 edit copy delete . .foo . - .foo: use before set: y . + .foo: use before set: 'y' . ] # rerun the file, check for the same error assume-console [ @@ -490,7 +480,7 @@ def foo [ .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. .0 edit copy delete . .foo . - .foo: use before set: y . + .foo: use before set: 'y' . ] ] @@ -512,7 +502,7 @@ scenario run-instruction-and-print-errors [ .0 edit copy delete . .get 1:address:point, 1:offset . .first ingredient of 'get' should be a container, ↩. - .but got 1:address:point . + .but got '1:address:point' . .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. . . ] @@ -523,7 +513,7 @@ scenario run-instruction-and-print-errors [ . . . . .first ingredient of 'get' should be a container, . - .but got 1:address:point . + .but got '1:address:point' . . . . . ] @@ -550,9 +540,9 @@ scenario run-instruction-and-print-errors-only-once [ .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. .0 edit copy delete . .get 1234:number, foo:offset . - .unknown element foo in container number . + .unknown element 'foo' in container 'number' . .first ingredient of 'get' should be a container, ↩. - .but got 1234:number . + .but got '1234:number' . .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. . . ] -- cgit 1.4.1-2-gfad0 43b57ce3c5cbc42278fa9'>^ 
ddeed58f ^

33352536 ^



ddeed58f ^

7a583220 ^

33352536 ^

9d27e966 ^


33352536 ^

9d27e966 ^

33352536 ^

ee9a9237 ^

6030d7e2 ^

ecfbbfb5 ^

33352536 ^

ecfbbfb5 ^

ddeed58f ^



71eb22a5 ^

33352536 ^



03d50cc8 ^

33352536 ^





ddeed58f ^

6323661c ^

6070c23e ^

ddeed58f ^

33352536 ^

6070c23e ^

ddeed58f ^

33352536 ^


6030d7e2 ^


03d50cc8 ^

6030d7e2 ^

6323661c ^

6070c23e ^

03d50cc8 ^

33352536 ^

6030d7e2 ^


03d50cc8 ^

33352536 ^

6030d7e2 ^

ed0e64a9 ^

ee9a9237 ^

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