react 0.5.2 → 0.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (85) hide show
  1. package/.travis.yml +5 -0
  2. package/Jakefile.js +39 -0
  3. package/README.md +15 -23
  4. package/browser-test/dist.html +90 -0
  5. package/browser-test/index.html +86 -0
  6. package/browser-test/min.html +90 -0
  7. package/dist/react.js +3107 -0
  8. package/dist/react.min.js +22 -0
  9. package/doc/advanced.md +10 -2
  10. package/examples/using-events1.js +1 -1
  11. package/lib/base-task.js +116 -110
  12. package/lib/cb-task.js +71 -67
  13. package/lib/core.js +116 -117
  14. package/lib/dsl.js +120 -115
  15. package/lib/error.js +44 -36
  16. package/lib/event-collector.js +69 -56
  17. package/lib/event-manager.js +81 -67
  18. package/lib/eventemitter.js +20 -0
  19. package/lib/finalcb-first-task.js +56 -53
  20. package/lib/finalcb-task.js +55 -51
  21. package/lib/id.js +18 -7
  22. package/lib/input-parser.js +49 -41
  23. package/lib/log-events.js +88 -73
  24. package/lib/parse.js +34 -25
  25. package/lib/promise-resolve.js +42 -27
  26. package/lib/promise-task.js +78 -74
  27. package/lib/react.js +59 -0
  28. package/lib/ret-task.js +59 -55
  29. package/lib/sprintf.js +18 -0
  30. package/lib/status.js +11 -2
  31. package/lib/task.js +215 -217
  32. package/lib/track-tasks.js +72 -58
  33. package/lib/validate.js +136 -136
  34. package/lib/vcon.js +78 -69
  35. package/lib/when-task.js +69 -65
  36. package/package.json +10 -9
  37. package/src/dist.build.requirejs +20 -0
  38. package/test/ast.mocha.js +136 -0
  39. package/test/cb-task.mocha.js +220 -0
  40. package/test/core-deferred.mocha.js +143 -0
  41. package/test/core-when.mocha.js +96 -0
  42. package/test/core.mocha.js +589 -0
  43. package/test/dsl.mocha.js +350 -0
  44. package/test/event-manager.mocha.js +119 -0
  45. package/test/exec-options.mocha.js +48 -0
  46. package/test/finalcb-task.mocha.js +58 -0
  47. package/test/input-parser.mocha.js +86 -0
  48. package/test/log-events.mocha.js +88 -0
  49. package/test/mocha.opts +2 -0
  50. package/test/module-use.mocha.js +147 -0
  51. package/test/promise-auto-resolve.mocha.js +68 -0
  52. package/test/ret-task.mocha.js +220 -0
  53. package/test/task.mocha.js +42 -0
  54. package/test/validate-cb-task.mocha.js +100 -0
  55. package/test/validate-ret-task.mocha.js +110 -0
  56. package/test/validate.mocha.js +324 -0
  57. package/test/vcon.mocha.js +193 -0
  58. package/vendor/chai/chai.js +2038 -0
  59. package/vendor/jquery/jquery-1.7.1.js +9266 -0
  60. package/vendor/jquery/jquery-1.7.1.min.js +4 -0
  61. package/vendor/mocha/mocha.css +135 -0
  62. package/vendor/mocha/mocha.js +3589 -0
  63. package/vendor/node/util.js +531 -0
  64. package/vendor/requirejs/require.js +2053 -0
  65. package/vendor/requirejs/require.min.js +33 -0
  66. package/react.js +0 -40
  67. package/test/ast.test.js +0 -118
  68. package/test/cb-task.test.js +0 -197
  69. package/test/core-deferred.test.js +0 -134
  70. package/test/core-promised.test.js +0 -132
  71. package/test/core-when.test.js +0 -84
  72. package/test/core.test.js +0 -593
  73. package/test/dsl.test.js +0 -330
  74. package/test/event-manager.test.js +0 -102
  75. package/test/exec-options.test.js +0 -33
  76. package/test/finalcb-task.test.js +0 -38
  77. package/test/input-parser.test.js +0 -66
  78. package/test/module-use.test.js +0 -134
  79. package/test/promise-auto-resolve.test.js +0 -52
  80. package/test/ret-task.test.js +0 -199
  81. package/test/task.test.js +0 -21
  82. package/test/validate-cb-task.test.js +0 -74
  83. package/test/validate-ret-task.test.js +0 -83
  84. package/test/validate.test.js +0 -295
  85. package/test/vcon.test.js +0 -173
package/test/dsl.test.js DELETED
@@ -1,330 +0,0 @@
1
- 'use strict';
2
-
3
- var test = require('tap').test;
4
- var sprintf = require('sprintf').sprintf;
5
-
6
- var react = require('../'); // require('react');
7
-
8
- function falpha() { }
9
- function fbeta() { }
10
-
11
- test('module exports is a fn with properties', function (t) {
12
- t.type(react, 'function', 'has define by DSL method'); //
13
- t.type(react.selectFirst, 'function', 'has selectFirst define method');
14
- t.end();
15
- });
16
-
17
- test('no arguments -> empty name, inParams, tasks, outTask', function (t) {
18
- var r = react();
19
- t.equal(r.ast.name.slice(0, 'flow_'.length), 'flow_', 'generated flow name should start with flow_');
20
- t.deepEqual(r.ast.inParams, []);
21
- t.deepEqual(r.ast.tasks, []);
22
- t.deepEqual(r.ast.outTask, { a: [], type: 'finalcb' });
23
- t.end();
24
- });
25
-
26
-
27
- test('empty first string -> empty name, inParams, tasks, outTask', function (t) {
28
- var r = react('');
29
- t.equal(r.ast.name.slice(0, 'flow_'.length), 'flow_', 'generated flow name should start with flow_');
30
- t.deepEqual(r.ast.inParams, []);
31
- t.deepEqual(r.ast.tasks, []);
32
- t.deepEqual(r.ast.outTask, { a: [], type: 'finalcb' });
33
- t.end();
34
- });
35
-
36
-
37
- test('single first string -> name, inParams["foo"], empty tasks, outTask', function (t) {
38
- var r = react('foo');
39
- t.equal(r.ast.name, 'foo');
40
- t.deepEqual(r.ast.inParams, []);
41
- t.deepEqual(r.ast.tasks, []);
42
- t.deepEqual(r.ast.outTask, { a: [], type: 'finalcb' });
43
- t.end();
44
- });
45
-
46
- test('triple first string -> inParams["foo", "bar", "baz"], empty tasks, outTask',
47
- function (t) {
48
- var r = react('myName', ' foo, bar,baz ');
49
- t.equal(r.ast.name, 'myName');
50
- t.deepEqual(r.ast.inParams, ['foo', 'bar', 'baz']);
51
- t.deepEqual(r.ast.tasks, []);
52
- t.deepEqual(r.ast.outTask, { a: [], type: 'finalcb' });
53
- t.end();
54
- });
55
-
56
- test('single task, single out params', function (t) {
57
- var r = react('myName', 'cb -> err, c',
58
- falpha, 'cb -> err, c'
59
- );
60
- t.deepEqual(r.ast.inParams, []);
61
- t.deepEqual(r.ast.tasks, [
62
- { f: falpha, a: [], out: ['c'], type: 'cb', name: 'falpha'}
63
- ]);
64
- t.deepEqual(r.ast.outTask, { a: ['c'], type: 'finalcb' });
65
- t.end();
66
- });
67
-
68
- test('single task, err and out params', function (t) {
69
- var r = react('myName', 'cb -> err, c',
70
- falpha, 'cb -> err, c'
71
- );
72
- t.deepEqual(r.ast.inParams, []);
73
- t.deepEqual(r.ast.tasks, [
74
- { f: falpha, a: [], out: ['c'], type: 'cb', name: 'falpha'}
75
- ]);
76
- t.deepEqual(r.ast.outTask, { a: ['c'], type: 'finalcb' });
77
- t.end();
78
- });
79
-
80
- test('using - with literal string', function (t) {
81
- var r = react('myName', '"hello-world", cb -> err, c',
82
- falpha, '"another-string", cb -> err, c'
83
- );
84
- t.deepEqual(r.ast.inParams, ['"hello-world"']);
85
- t.deepEqual(r.ast.tasks, [
86
- { f: falpha, a: ['"another-string"'], out: ['c'], type: 'cb', name: 'falpha'}
87
- ]);
88
- t.deepEqual(r.ast.outTask, { a: ['c'], type: 'finalcb' });
89
- t.end();
90
- });
91
-
92
- test('single task, ERR and out params', function (t) {
93
- var r = react('myName', 'cb -> ERR, c',
94
- falpha, 'cb -> ERR, c'
95
- );
96
- t.deepEqual(r.ast.inParams, []);
97
- t.deepEqual(r.ast.tasks, [
98
- { f: falpha, a: [], out: ['c'], type: 'cb', name: 'falpha'}
99
- ]);
100
- t.deepEqual(r.ast.outTask, { a: ['c'], type: 'finalcb' });
101
- t.end();
102
- });
103
-
104
- test('cb used in defs is simply ignored', function (t) {
105
- var r = react('myName', 'a, b, cb -> err, c',
106
- falpha, 'a, b, cb -> err, c'
107
- );
108
- t.deepEqual(r.ast.inParams, ['a', 'b']);
109
- t.deepEqual(r.ast.tasks, [
110
- { f: falpha, a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'}
111
- ]);
112
- t.deepEqual(r.ast.outTask, { a: ['c'], type: 'finalcb' });
113
- t.end();
114
- });
115
-
116
- test('callback used in defs is simply ignored', function (t) {
117
- var r = react('myName', 'a, b, callback -> err, c',
118
- falpha, 'a, b, callback -> err, c'
119
- );
120
- t.deepEqual(r.ast.inParams, ['a', 'b']);
121
- t.deepEqual(r.ast.tasks, [
122
- { f: falpha, a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'}
123
- ]);
124
- t.deepEqual(r.ast.outTask, { a: ['c'], type: 'finalcb' });
125
- t.end();
126
- });
127
-
128
- test('two inputs, two tasks, two out params', function (t) {
129
- var r = react('myName', 'a, b, cb -> err, c, d',
130
- falpha, 'a, b, cb -> err, c',
131
- fbeta, 'a, b, cb -> err, d, e'
132
- );
133
- t.deepEqual(r.ast.inParams, ['a', 'b']);
134
- t.deepEqual(r.ast.tasks, [
135
- { f: falpha, a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'},
136
- { f: fbeta, a: ['a', 'b'], out: ['d', 'e'], type: 'cb', name: 'fbeta'}
137
- ]);
138
- t.deepEqual(r.ast.outTask, { a: ['c', 'd'], type: 'finalcb' });
139
- t.end();
140
- });
141
-
142
- test('two inputs, two tasks, two out params, options', function (t) {
143
- var r = react('myName', 'a, b, cb -> err, c, d',
144
- { otherOptFoo: 'foo'}, // main flow options
145
- falpha, 'a, b, cb -> err, c',
146
- fbeta, 'a, b, cb -> err, d, e'
147
- );
148
- t.deepEqual(r.ast.inParams, ['a', 'b']);
149
- t.deepEqual(r.ast.tasks, [
150
- { f: falpha, a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'},
151
- { f: fbeta, a: ['a', 'b'], out: ['d', 'e'], type: 'cb', name: 'fbeta'}
152
- ]);
153
- t.deepEqual(r.ast.outTask, { a: ['c', 'd'], type: 'finalcb' });
154
- t.equal(r.ast.name, 'myName', 'name should match');
155
- t.equal(r.ast.otherOptFoo, 'foo', 'other options should pass through');
156
- t.end();
157
- });
158
-
159
- test('two inputs, two mixed tasks, two out params', function (t) {
160
- var r = react('myName', 'a, b, cb -> err, c, d',
161
- falpha, 'a, b, cb -> err, c',
162
- fbeta, 'a, b -> d'
163
- );
164
- t.deepEqual(r.ast.inParams, ['a', 'b']);
165
- t.deepEqual(r.ast.tasks, [
166
- { f: falpha, a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'},
167
- { f: fbeta, a: ['a', 'b'], out: ['d'], type: 'ret', name: 'fbeta'}
168
- ]);
169
- t.deepEqual(r.ast.outTask, { a: ['c', 'd'], type: 'finalcb' });
170
- t.end();
171
- });
172
-
173
-
174
- test('two inputs, two mixed tasks, two out params, opts', function (t) {
175
- var r = react('myName', 'a, b, cb -> err, c, d',
176
- falpha, 'a, cb -> err, c', { after: fbeta },
177
- fbeta, 'a, b -> d'
178
- );
179
- t.deepEqual(r.ast.inParams, ['a', 'b']);
180
- t.deepEqual(r.ast.tasks, [
181
- { after: ['fbeta'], f: falpha, a: ['a'], out: ['c'], type: 'cb', name: 'falpha'},
182
- { f: fbeta, a: ['a', 'b'], out: ['d'], type: 'ret', name: 'fbeta'}
183
- ]);
184
- t.deepEqual(r.ast.outTask, { a: ['c', 'd'], type: 'finalcb' });
185
- t.end();
186
- });
187
-
188
-
189
- // Object use
190
- test('object prop task params', function (t) {
191
- var r = react('myName', 'a, b, cb -> err, c, e',
192
- falpha, 'a, b.cat, cb -> err, c',
193
- fbeta, 'c.dog, b -> d',
194
- 'd.egg', 'c, cb -> err, e'
195
- );
196
- t.deepEqual(r.ast.inParams, ['a', 'b']);
197
- t.deepEqual(r.ast.tasks, [
198
- { f: falpha, a: ['a', 'b.cat'], out: ['c'], type: 'cb', name: 'falpha'},
199
- { f: fbeta, a: ['c.dog', 'b'], out: ['d'], type: 'ret', name: 'fbeta'},
200
- { f: 'd.egg', a: ['c'], out: ['e'], type: 'cb', name: 'd.egg'}
201
- ]);
202
- t.deepEqual(r.ast.outTask, { a: ['c', 'e'], type: 'finalcb' });
203
- t.end();
204
- });
205
-
206
- // Errors
207
-
208
- test('missing name, throws error', function (t) {
209
- var fn = function () {
210
- var r = react('cb -> err, c',
211
- falpha, 'cb -> err, c'
212
- );
213
- };
214
- t.throws(fn, new Error('first flow parameter should be the flow name, but found in/out def: cb -> err, c'));
215
- t.end();
216
- });
217
-
218
- test('missing err in flow in/out - force for consistency, throw error', function (t) {
219
- var fn = function () {
220
- var r = react('myname', 'cb -> c', // missing err
221
- falpha, 'cb -> err, c'
222
- );
223
- };
224
- t.throws(fn, new Error('callback specified, but first out param was not "err", use for clarity. Found in/out def: cb -> c'));
225
- t.end();
226
- });
227
-
228
- test('missing err in task in/out - force for consistency, throw error', function (t) {
229
- var fn = function () {
230
- var r = react('myname', 'cb -> err, c',
231
- falpha, 'cb -> c' // missing err
232
- );
233
- };
234
- t.throws(fn, new Error('callback specified, but first out param was not "err", use for clarity. Found in/out def: cb -> c'));
235
- t.end();
236
- });
237
-
238
- test('found err, but missing cb/callback in flow in/out - force for consistency, throw error', function (t) {
239
- var fn = function () {
240
- var r = react('myname', 'a -> err, c', // missing cb
241
- falpha, 'cb -> err, c'
242
- );
243
- };
244
- t.throws(fn, new Error('found err param, but cb/callback is not specified, is this cb-style async or sync function? Found in/out def: a -> err, c'));
245
- t.end();
246
- });
247
-
248
- test('found err, but missing cb/callback in task in/out - force for consistency, throw error', function (t) {
249
- var fn = function () {
250
- var r = react('myname', 'cb -> err, c',
251
- falpha, 'a -> err, c' // missing cb
252
- );
253
- };
254
- t.throws(fn, new Error('found err param, but cb/callback is not specified, is this cb-style async or sync function? Found in/out def: a -> err, c'));
255
- t.end();
256
- });
257
-
258
- test('extra arg throws error', function (t) {
259
- var fn = function () {
260
- var r = react('myName', 'a, b, cb -> err, c, d',
261
- falpha, 'a, cb -> err, c', { after: fbeta },
262
- fbeta, 'a, b -> returns d',
263
- 'extraBadArg'
264
- );
265
- };
266
- t.throws(fn, new Error('extra unmatched task arg: extraBadArg'));
267
- t.end();
268
- });
269
-
270
- test('not enough args throws error', function (t) {
271
- var fn = function () {
272
- var r = react('myName', 'a, b, cb -> err, c, d',
273
- falpha, 'a, cb -> err, c', { after: fbeta },
274
- fbeta
275
- );
276
- };
277
- t.throws(fn, new Error(sprintf('extra unmatched task arg: %s', fbeta)));
278
- t.end();
279
- });
280
-
281
- test('long example', function (t) {
282
- /*jshint white: false */
283
- t.plan(4);
284
- function loadUser(uid, cb){ setTimeout(cb, 100, null, "User"+uid); }
285
- function loadFile(filename, cb){ setTimeout(cb, 100, null, 'Filedata'+filename); }
286
- function markdown(filedata) { return 'html'+filedata; }
287
- function prepareDirectory(outDirname, cb){ setTimeout(cb, 200, null, 'dircreated-'+outDirname); }
288
- function writeOutput(html, user, cb){ setTimeout(cb, 300, null, html+'_bytesWritten'); }
289
- function loadEmailTemplate(cb) { setTimeout(cb, 50, null, 'emailmd'); }
290
- function customizeEmail(user, emailHtml) { return 'cust-'+user+emailHtml; }
291
- function deliverEmail(custEmailHtml, cb) { setTimeout(cb, 100, null, 'delivered-'+custEmailHtml); }
292
- var loadAndSave = react('loadAndSave', 'filename, uid, outDirname, cb -> err, html, user, bytesWritten', // name, in/out params
293
- loadUser, 'uid, cb -> err, user', // calling async fn loadUser with uid, callback is called with err and user
294
- loadFile, 'filename, cb -> err, filedata',
295
- markdown, 'filedata -> html', // using a sync function
296
- prepareDirectory, 'outDirname, cb -> err, dircreated',
297
- writeOutput, 'html, user, cb -> err, bytesWritten', { after: prepareDirectory }, // only after prepareDirectory done
298
- loadEmailTemplate, 'cb -> err, emailmd',
299
- markdown, 'emailmd -> emailHtml', // using a sync function
300
- customizeEmail, 'user, emailHtml -> custEmailHtml',
301
- deliverEmail, 'custEmailHtml, cb -> err, deliveredEmail', { after: writeOutput } // only after writeOutput is done
302
- );
303
- loadAndSave('file.md', 100, '/tmp/foo', function (err, html, user, bytesWritten) { // executing the flow
304
- t.equal(err, null);
305
- t.equal(html, 'htmlFiledatafile.md');
306
- t.equal(user, 'User100');
307
- t.equal(bytesWritten, 'htmlFiledatafile.md_bytesWritten');
308
- t.end();
309
- });
310
- });
311
-
312
- // selectFirst
313
-
314
- test('selectFirst', function (t) {
315
- var r = react.selectFirst('myName', 'a, b, cb -> err, c',
316
- { otherOptFoo: 'foo'}, // main options
317
- falpha, 'a, b, cb -> err, c',
318
- fbeta, 'a, b -> c'
319
- );
320
- t.equal(r.ast.name, 'myName');
321
- t.deepEqual(r.ast.inParams, ['a', 'b']);
322
- t.deepEqual(r.ast.tasks, [
323
- { f: falpha, a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'},
324
- { f: fbeta, a: ['a', 'b'], out: ['c'], type: 'ret', name: 'fbeta', after: ['falpha']}
325
- ]);
326
- t.deepEqual(r.ast.outTask, { type: 'finalcbFirst', a: ['c'] });
327
- t.equal(r.ast.name, 'myName', 'name should match if supplied');
328
- t.equal(r.ast.otherOptFoo, 'foo', 'other options should pass through');
329
- t.end();
330
- });
@@ -1,102 +0,0 @@
1
- 'use strict';
2
-
3
- var test = require('tap').test;
4
-
5
- var EventManager = require('../lib/event-manager.js');
6
-
7
- test('Event Manager is disabled by default', function (t) {
8
- var em = EventManager.create();
9
- t.notOk(em.isEnabled(), 'should be falsey by default');
10
- t.end();
11
- });
12
-
13
- test('Event Manager enabled when a listener if registered', function (t) {
14
- var em = EventManager.create();
15
- em.on('foo', function () { });
16
- t.ok(em.isEnabled(), 'should be truthy');
17
- t.end();
18
- });
19
-
20
- test('Event Manager emits events', function (t) {
21
- t.plan(1);
22
- var em = EventManager.create();
23
- em.on('foo', function (data) {
24
- t.equal(data, 'hello');
25
- t.end();
26
- });
27
- em.emit('foo', 'hello');
28
- });
29
-
30
- test('Event Manager emits events, wildcarded listener', function (t) {
31
- t.plan(1);
32
- var em = EventManager.create();
33
- em.on('foo.*', function (data) {
34
- t.equal(data, 'hello-world');
35
- t.end();
36
- });
37
- em.emit('foo.bar', 'hello-world');
38
- });
39
-
40
- test('Event Manager emits events, all wildcarded listener', function (t) {
41
- t.plan(1);
42
- var em = EventManager.create();
43
- em.on('*', function (data) {
44
- t.equal(data, 'hello-world');
45
- t.end();
46
- });
47
- em.emit('foo.bar', 'hello-world');
48
- });
49
-
50
- test('Event Manager emits event with three args', function (t) {
51
- t.plan(3);
52
- var em = EventManager.create();
53
- em.on('foo', function (data, data2, data3) {
54
- t.equal(data, 'hello');
55
- t.equal(data2, 'world');
56
- t.equal(data3, 100);
57
- t.end();
58
- });
59
- em.emit('foo', 'hello', 'world', 100);
60
- });
61
-
62
- test('Event Manager with a parentListener will receive events', function (t) {
63
- t.plan(1);
64
- var parentEm = EventManager.create();
65
- var em = EventManager.create();
66
- em.parent = parentEm;
67
- parentEm.on('foo', function (data) {
68
- t.equal(data, 'world');
69
- t.end();
70
- });
71
- em.emit('foo', 'world');
72
- });
73
-
74
- test('Event Manager w/listening grandparent will receive events', function (t) {
75
- t.plan(1);
76
- var grandEm = EventManager.create();
77
- var parentEm = EventManager.create();
78
- parentEm.parent = grandEm;
79
- var em = EventManager.create();
80
- em.parent = parentEm;
81
- grandEm.on('foo', function (data) {
82
- t.equal(data, 'world');
83
- t.end();
84
- });
85
- em.emit('foo', 'world');
86
- });
87
-
88
- test('Event Manager all parents w/listeners will receive events', function (t) {
89
- t.plan(3);
90
- var grandEm = EventManager.create();
91
- var parentEm = EventManager.create();
92
- parentEm.parent = grandEm;
93
- var em = EventManager.create();
94
- em.parent = parentEm;
95
- function recData(data) {
96
- t.equal(data, 'hello');
97
- }
98
- grandEm.on('bar', recData);
99
- parentEm.on('bar', recData);
100
- em.on('bar', recData);
101
- em.emit('bar', 'hello');
102
- });
@@ -1,33 +0,0 @@
1
- 'use strict';
2
-
3
- var test = require('tap').test;
4
-
5
- var react = require('../react');
6
-
7
- function multiply(x, y, cb) { cb(null, x * y); }
8
-
9
- test('execOptions as first param', function (t) {
10
- t.plan(3);
11
- var fn = react();
12
- var errors = fn.setAndValidateAST({
13
- inParams: ['a', 'b'],
14
- tasks: [
15
- { f: multiply, a: ['a', 'b'], out: ['c'] }
16
- ],
17
- outTask: { a: ['c'] }
18
- });
19
- t.deepEqual(errors, [], 'no validation errors');
20
-
21
- var execOptions = {
22
- reactExecOptions: true,
23
- outputStyle: 'cb'
24
- };
25
-
26
- fn(execOptions, 2, 3, function (err, c) {
27
- t.equal(err, null);
28
- t.equal(c, 6);
29
- t.end();
30
- });
31
- });
32
-
33
-