livetext 0.9.26 → 0.9.27

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/lib/livetext/funcall.rb +13 -94
  3. data/lib/livetext/lineparser.rb +165 -31
  4. data/lib/livetext/parser/string.rb +14 -5
  5. data/lib/livetext/skeleton.rb +0 -4
  6. data/lib/livetext/standard.rb +2 -2
  7. data/lib/livetext/userapi.rb +0 -1
  8. data/lib/livetext/version.rb +1 -1
  9. data/lib/livetext.rb +0 -1
  10. data/test/snapshots/basic_formatting/actual-output.txt +8 -8
  11. data/test/snapshots/basic_formatting/out-sdiff.txt +8 -8
  12. data/test/snapshots/functions/actual-error.txt +19 -0
  13. data/test/snapshots/functions/actual-output.txt +0 -0
  14. data/test/snapshots/functions/err-sdiff.txt +20 -0
  15. data/test/snapshots/more_complex_vars/actual-error.txt +0 -0
  16. data/test/snapshots/more_complex_vars/actual-output.txt +4 -0
  17. data/test/snapshots/more_complex_vars/err-sdiff.txt +1 -0
  18. data/test/snapshots/more_complex_vars/out-sdiff.txt +5 -0
  19. data/test/snapshots/more_functions/actual-error.txt +19 -0
  20. data/test/snapshots/more_functions/actual-output.txt +0 -37
  21. data/test/snapshots/more_functions/err-sdiff.txt +19 -0
  22. data/test/snapshots/raw_lines/actual-error.txt +22 -0
  23. data/test/snapshots/raw_lines/actual-output.txt +0 -0
  24. data/test/snapshots/raw_lines/err-sdiff.txt +23 -0
  25. data/test/snapshots/simple_vars/actual-output.txt +2 -2
  26. data/test/snapshots/simple_vars/out-sdiff.txt +2 -2
  27. data/test/snapshots/var_into_func/actual-error.txt +19 -0
  28. data/test/snapshots/var_into_func/actual-output.txt +0 -16
  29. data/test/snapshots/var_into_func/err-sdiff.txt +19 -0
  30. data/test/unit/all.rb +0 -1
  31. data/test/unit/lineparser.rb +62 -353
  32. data/test/unit/new_lineparser.rb +359 -0
  33. data/test/unit/tokenizer.rb +2 -1
  34. metadata +13 -6
  35. data/lib/livetext/formatline.rb +0 -408
  36. data/test/snapshots/more_functions/out-sdiff.txt +0 -38
  37. data/test/testlines.rb +0 -37
  38. data/test/unit/formatline.rb +0 -638
data/test/snapshots/more_functions/err-sdiff.txt CHANGED
@@ -1 +1,20 @@
1
1
  ACTUAL | EXPECTED
2
+ /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparse <
3
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
4
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
5
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
6
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
7
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
8
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
9
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
10
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
11
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
12
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
13
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
14
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
15
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
16
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
17
+ from ../../../bin/livetext:89:in `block in parse_co <
18
+ from ../../../bin/livetext:75:in `loop' <
19
+ from ../../../bin/livetext:75:in `parse_command_lin <
20
+ from ../../../bin/livetext:106:in `<main>' <
data/test/snapshots/raw_lines/actual-error.txt ADDED
@@ -0,0 +1,22 @@
1
+ /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:123:in `grab_func_param': wrong number of arguments (given 0, expected 1) (ArgumentError)
2
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/funcall.rb:55:in `grab_func_with_param'
3
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/funcall.rb:63:in `double_dollar'
4
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:387:in `dollar'
5
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:235:in `grab_token'
6
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:247:in `block in tokenize'
7
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:245:in `loop'
8
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:245:in `tokenize'
9
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:45:in `parse!'
10
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/userapi.rb:122:in `format'
11
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/userapi.rb:39:in `data='
12
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/standard.rb:31:in `data='
13
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:151:in `get_name'
14
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:129:in `handle_dotcmd'
15
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:100:in `process_line'
16
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:86:in `block in process_file'
17
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:83:in `loop'
18
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:83:in `process_file'
19
+ from ../../../bin/livetext:89:in `block in parse_command_line'
20
+ from ../../../bin/livetext:75:in `loop'
21
+ from ../../../bin/livetext:75:in `parse_command_line'
22
+ from ../../../bin/livetext:106:in `<main>'
data/test/snapshots/raw_lines/actual-output.txt ADDED
File without changes
data/test/snapshots/raw_lines/err-sdiff.txt ADDED
@@ -0,0 +1,23 @@
1
+ ACTUAL | EXPECTED
2
+ /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparse <
3
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
4
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
5
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
6
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
7
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
8
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
9
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
10
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
11
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
12
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
13
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
14
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
15
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
16
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
17
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
18
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
19
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
20
+ from ../../../bin/livetext:89:in `block in parse_co <
21
+ from ../../../bin/livetext:75:in `loop' <
22
+ from ../../../bin/livetext:75:in `parse_command_lin <
23
+ from ../../../bin/livetext:106:in `<main>' <
data/test/snapshots/simple_vars/actual-output.txt CHANGED
@@ -1,6 +1,6 @@
1
1
  Just
2
2
  some text.
3
3
  Hi, there.
4
- GulliverFoyle is my name, and Terra is my nation.
5
- I'm GulliverFoyle, from Terra
4
+ is my name, and is my nation.
5
+ I'm , from
6
6
  That's all.
data/test/snapshots/simple_vars/out-sdiff.txt CHANGED
@@ -2,6 +2,6 @@ ACTUAL | EXPECTED
2
2
  Just Just
3
3
  some text. some text.
4
4
  Hi, there. Hi, there.
5
- GulliverFoyle is my name, and Terra is my nation. GulliverFoyle is my name, and Terra is my nation.
6
- I'm GulliverFoyle, from Terra | I'm GulliverFoyle, from Terra.
5
+ is my name, and is my nation. | GulliverFoyle is my name, and Terra is my nation.
6
+ I'm , from | I'm GulliverFoyle, from Terra.
7
7
  That's all. That's all.
data/test/snapshots/var_into_func/actual-error.txt CHANGED
@@ -0,0 +1,19 @@
1
+ /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:123:in `grab_func_param': wrong number of arguments (given 0, expected 1) (ArgumentError)
2
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/funcall.rb:55:in `grab_func_with_param'
3
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/funcall.rb:63:in `double_dollar'
4
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:387:in `dollar'
5
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:235:in `grab_token'
6
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:247:in `block in tokenize'
7
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:245:in `loop'
8
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:245:in `tokenize'
9
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparser.rb:45:in `parse!'
10
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/userapi.rb:122:in `format'
11
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/userapi.rb:129:in `passthru'
12
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:104:in `process_line'
13
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:86:in `block in process_file'
14
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:83:in `loop'
15
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/helpers.rb:83:in `process_file'
16
+ from ../../../bin/livetext:89:in `block in parse_command_line'
17
+ from ../../../bin/livetext:75:in `loop'
18
+ from ../../../bin/livetext:75:in `parse_command_line'
19
+ from ../../../bin/livetext:106:in `<main>'
data/test/snapshots/var_into_func/actual-output.txt CHANGED
@@ -1,16 +0,0 @@
1
- <p>
2
-
3
- Testing STILL more functions here...
4
- <p>
5
-
6
- <p>
7
-
8
- Now... let's try passing a variable to a function. Will this work??
9
- <p>
10
-
11
- Variable \regal is regal, which reversed is ahpla$
12
- <p>
13
-
14
- That's all.
15
- <p>
16
-
data/test/snapshots/var_into_func/err-sdiff.txt CHANGED
@@ -1 +1,20 @@
1
1
  ACTUAL | EXPECTED
2
+ /Users/Hal/Dropbox/topx/git/livetext/lib/livetext/lineparse <
3
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
4
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
5
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
6
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
7
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
8
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
9
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
10
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
11
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
12
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
13
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
14
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
15
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
16
+ from /Users/Hal/Dropbox/topx/git/livetext/lib/livet <
17
+ from ../../../bin/livetext:89:in `block in parse_co <
18
+ from ../../../bin/livetext:75:in `loop' <
19
+ from ../../../bin/livetext:75:in `parse_command_lin <
20
+ from ../../../bin/livetext:106:in `<main>' <
data/test/unit/all.rb CHANGED
@@ -1,6 +1,5 @@
1
1
 
2
2
  require_relative 'standard'
3
3
  require_relative 'parser' # nested
4
- # require_relative 'formatline'
5
4
  require_relative 'lineparser'
6
5
  require_relative 'tokenizer'