Torsten Ruger
|
277dddeb6a
|
time was up for the Bassembler
|
2014-10-02 22:33:09 +03:00 |
|
Torsten Ruger
|
1be71918a5
|
move all arm instructions to own folder and fold inheritance
|
2014-10-02 22:28:34 +03:00 |
|
Torsten Ruger
|
9923eb0b07
|
move passes to own dir
|
2014-10-02 16:11:45 +03:00 |
|
Torsten Ruger
|
cc08016a0f
|
fix the logic of move, but really there is a deeper issue (we'd have to add to get pc relative addressing for constants)
|
2014-10-02 16:08:24 +03:00 |
|
Torsten Ruger
|
0e3e11a699
|
add more debug (string values)
|
2014-10-02 16:06:05 +03:00 |
|
Torsten Ruger
|
493b02674c
|
remove some boiler
|
2014-09-30 12:08:12 +03:00 |
|
Torsten Ruger
|
fba66371c0
|
(semi) proper fix for large moves, integers or virtual constants(was buggy)
|
2014-09-30 12:07:21 +03:00 |
|
Torsten Ruger
|
527e591e75
|
fix add instruction and test
|
2014-09-29 21:04:38 +03:00 |
|
Torsten Ruger
|
7d52e71f5c
|
found and implemented the movw, but not for pi :-(
|
2014-09-29 20:26:55 +03:00 |
|
Torsten Ruger
|
d8710de590
|
fix frame more
|
2014-09-28 11:18:24 +03:00 |
|
Torsten Ruger
|
5a17bf3396
|
more headway on the (new) frame implementation
|
2014-09-27 14:59:16 +03:00 |
|
Torsten Ruger
|
2ce17ed5ff
|
fold messages and frames to save an instance in bootspace
|
2014-09-25 20:31:21 +03:00 |
|
Torsten Ruger
|
efe39292ae
|
extract position as module to be included
|
2014-09-25 20:30:02 +03:00 |
|
Torsten Ruger
|
6c7004688b
|
bit of namespace cleanup
|
2014-09-25 20:29:05 +03:00 |
|
Torsten Ruger
|
4d07113429
|
add register reference where symbols are allowed
|
2014-09-25 20:28:40 +03:00 |
|
Torsten Ruger
|
df9d6284ae
|
up to, ut not including, creating frames
|
2014-09-24 18:25:18 +03:00 |
|
Torsten Ruger
|
363fe5e35f
|
scaffold for NewMessage and Frame
|
2014-09-24 18:15:08 +03:00 |
|
Torsten Ruger
|
31ee3a62fe
|
rename __send__ for now
|
2014-09-24 18:14:23 +03:00 |
|
Torsten Ruger
|
892f251d18
|
implement how send should work (but parfait doesn't parse yet, so it doesnt)
|
2014-09-23 20:16:05 +03:00 |
|
Torsten Ruger
|
f5ec7f3bdb
|
fixed
|
2014-09-23 19:23:52 +03:00 |
|
Torsten Ruger
|
c5765d4255
|
improve return implementation
|
2014-09-23 19:20:55 +03:00 |
|
Torsten Ruger
|
4e01bc798f
|
add NewMessage / Frame instructions (without actual implementation)
|
2014-09-23 19:06:10 +03:00 |
|
Torsten Ruger
|
3d5eb685a1
|
more constants for slots
|
2014-09-20 17:06:11 +03:00 |
|
Torsten Ruger
|
21177bd7ce
|
add a list of symbols to boot space
|
2014-09-19 19:11:30 +03:00 |
|
Torsten Ruger
|
457b40a7de
|
fix api and implement the big constant move
|
2014-09-18 17:05:59 +03:00 |
|
Torsten Ruger
|
c32ca84861
|
clean
|
2014-09-18 17:05:22 +03:00 |
|
Torsten Ruger
|
f80df69262
|
clean
|
2014-09-18 17:04:54 +03:00 |
|
Torsten Ruger
|
49b6b99ab9
|
more work on large moves, including the notion of linking again
|
2014-09-17 17:00:19 +03:00 |
|
Torsten Ruger
|
4af93493fb
|
class code went
|
2014-09-17 16:32:21 +03:00 |
|
Torsten Ruger
|
e7f7f9c319
|
move fits_u8 to integer constant (from numberic)
|
2014-09-17 16:23:29 +03:00 |
|
Torsten Ruger
|
95c7e44342
|
at least it assembles again
|
2014-09-17 12:11:34 +03:00 |
|
Torsten Ruger
|
e4474e7e2c
|
rename length to mem_length and suffer the consequences
|
2014-09-17 12:04:54 +03:00 |
|
Torsten Ruger
|
79e42003b2
|
collect all add functions at bottom (rename too)
|
2014-09-16 18:50:44 +03:00 |
|
Torsten Ruger
|
8b8a8eea56
|
rename code.length tp mem_length with lots of noise impact
|
2014-09-16 17:16:56 +03:00 |
|
Torsten Ruger
|
cffa7f1953
|
small function naming adjustments
|
2014-09-16 17:16:13 +03:00 |
|
Torsten Ruger
|
db01529b67
|
eol warning
|
2014-09-16 17:15:17 +03:00 |
|
Torsten Ruger
|
45977ecc01
|
move assembly from visitor into objects, part one
|
2014-09-16 16:06:56 +03:00 |
|
Torsten Ruger
|
bbcfef3c43
|
make a little more real
|
2014-09-16 16:05:38 +03:00 |
|
Torsten Ruger
|
dd8e46fd1c
|
move length here
|
2014-09-16 16:05:08 +03:00 |
|
Torsten Ruger
|
56facae658
|
eol signal
|
2014-09-16 16:04:53 +03:00 |
|
Torsten Ruger
|
16b3cacc8d
|
work to move large constants
|
2014-09-16 11:39:08 +03:00 |
|
Torsten Ruger
|
c92b165a3f
|
carry constants through in reference slots. resolve functions with it
|
2014-09-15 12:08:37 +03:00 |
|
Torsten Ruger
|
bdd4a3d6ad
|
just checking which part of unimplemented i hit
|
2014-09-14 21:26:30 +03:00 |
|
Torsten Ruger
|
c51dbf51e1
|
renamed true,false,nil class to constant (from value)
|
2014-09-14 18:15:33 +03:00 |
|
Torsten Ruger
|
6b85054958
|
better, correcter use of return storage
|
2014-09-14 18:14:57 +03:00 |
|
Torsten Ruger
|
b29de4600e
|
use slot constants
|
2014-09-11 21:30:40 +03:00 |
|
Torsten Ruger
|
b7e0d3fba4
|
more on set
|
2014-09-11 21:26:22 +03:00 |
|
Torsten Ruger
|
1d33c03537
|
corrected method enter and return and created those missing constants
|
2014-09-11 19:00:14 +03:00 |
|
Torsten Ruger
|
771eeb7a3d
|
fix block positions for debug
|
2014-09-11 15:19:29 +03:00 |
|
Torsten Ruger
|
98a88ec10e
|
change to module style like other modules in this dir
|
2014-09-11 15:08:56 +03:00 |
|
Torsten Ruger
|
3d66ffcc17
|
start on __init__
|
2014-09-11 15:01:50 +03:00 |
|
Torsten Ruger
|
cb727c658e
|
add inital jump to __init__
|
2014-09-11 10:30:23 +03:00 |
|
Torsten Ruger
|
f44965ef21
|
fix padding bug
|
2014-09-10 21:43:05 +03:00 |
|
Torsten Ruger
|
e53de8ad43
|
fixup names in builtin module
|
2014-09-10 21:35:52 +03:00 |
|
Torsten Ruger
|
5a5e977b8f
|
get some old builtin code backonline and improve imports
|
2014-09-09 18:03:13 +03:00 |
|
Torsten Ruger
|
61e80d4f28
|
had to boot_classes outside constructor (unfortunately) because of recursion
|
2014-09-09 17:51:34 +03:00 |
|
Torsten Ruger
|
7036a87678
|
fix the address for calls to jump past the method object header
|
2014-09-09 17:36:33 +03:00 |
|
Torsten Ruger
|
e3fdbb30a5
|
remove relative positions. have to fix them up somehow
|
2014-09-09 17:29:24 +03:00 |
|
Torsten Ruger
|
97bfd77038
|
implements the type word
|
2014-09-09 13:28:07 +03:00 |
|
Torsten Ruger
|
8040829501
|
moves link slot positions to bytes (from words). easier maths and better for later
|
2014-09-07 17:31:40 +03:00 |
|
Torsten Ruger
|
f00b06bb44
|
move to relative (to self) addressing
|
2014-09-06 23:03:33 +03:00 |
|
Torsten Ruger
|
c6072c683b
|
oops, less said the better
|
2014-09-06 22:48:58 +03:00 |
|
Torsten Ruger
|
64a433fd15
|
move the 2 to pad_to (from each call)
|
2014-09-06 22:38:32 +03:00 |
|
Torsten Ruger
|
bfa3f28e97
|
fix assembly (at least lositions and padding)
|
2014-09-06 19:48:56 +03:00 |
|
Torsten Ruger
|
197ecd576e
|
debugging assembly
|
2014-09-05 20:56:05 +03:00 |
|
Torsten Ruger
|
d94ec6c72c
|
fix parfait test
|
2014-09-04 14:22:28 +03:00 |
|
Torsten Ruger
|
5bb03f2d8b
|
unscoping block names and adding labels to objects (which are off)
|
2014-08-30 20:55:22 +03:00 |
|
Torsten Ruger
|
ccb5b37a3c
|
reinserted arm for now, until dependecy is cleaned up. fixed tests
|
2014-08-30 19:40:37 +03:00 |
|
Torsten Ruger
|
050a8ada9f
|
fix position handling
|
2014-08-30 17:08:30 +03:00 |
|
Torsten Ruger
|
6d67c03cc9
|
make block replace take array or single instruction
|
2014-08-30 16:57:56 +03:00 |
|
Torsten Ruger
|
48b33e5f9d
|
add position to instruction (for relative calculations)
|
2014-08-30 16:57:34 +03:00 |
|
Torsten Ruger
|
18f33770b5
|
fix and use object writer in test
|
2014-08-30 14:17:00 +03:00 |
|
Torsten Ruger
|
b5c39b2749
|
minor debug remove
|
2014-08-30 14:16:41 +03:00 |
|
Torsten Ruger
|
726a514c9e
|
fix assembler recursion
|
2014-08-30 14:01:22 +03:00 |
|
Torsten Ruger
|
50af6a8f41
|
lots of rework on assembly. constant object for layouts, hash implementation.
|
2014-08-30 13:48:52 +03:00 |
|
Torsten Ruger
|
d33077c2b1
|
reworking method and block assembly for new aproach
|
2014-08-30 13:47:51 +03:00 |
|
Torsten Ruger
|
90e5b4584a
|
rework link into two phase
|
2014-08-29 21:00:25 +03:00 |
|
Torsten Ruger
|
cec339890c
|
fold the linker back into assembler. too easy to get the link and assemble functions out off sync
|
2014-08-29 17:20:59 +03:00 |
|
Torsten Ruger
|
3ed1e814ec
|
more towards correct assembly
|
2014-08-29 15:49:59 +03:00 |
|
Torsten Ruger
|
99b4468599
|
fix spelling
|
2014-08-28 22:32:53 +03:00 |
|
Torsten Ruger
|
35b738639b
|
improve readmes
|
2014-08-28 19:12:46 +03:00 |
|
Torsten Ruger
|
1fc3f1fb18
|
renaming ripples
|
2014-08-28 18:53:48 +03:00 |
|
Torsten Ruger
|
09698ec70a
|
moved to consitent md ending
|
2014-08-28 18:52:55 +03:00 |
|
Torsten Ruger
|
b8a74f4a77
|
renamed the kernel dir/ module to Builtin (so to not confuse with ruby kernel module)
|
2014-08-28 18:27:04 +03:00 |
|
Torsten Ruger
|
8c1c72f1c3
|
remove that all include file
|
2014-08-28 16:44:27 +03:00 |
|
Torsten Ruger
|
9dd37a74df
|
add a kenrnel array class with function stubs
|
2014-08-28 16:39:35 +03:00 |
|
Torsten Ruger
|
da3cd69a5c
|
fixed the old list tests for hash, and fixed hash to pass them
|
2014-08-28 16:28:25 +03:00 |
|
Torsten Ruger
|
d3c4087871
|
use simple array based hash, so assembly of it will be easy
|
2014-08-28 16:20:09 +03:00 |
|
Torsten Ruger
|
0bc0506c5a
|
small fix for str len
|
2014-08-28 16:19:43 +03:00 |
|
Torsten Ruger
|
c7bc18dac8
|
small fix for str len
|
2014-08-28 16:19:30 +03:00 |
|
Torsten Ruger
|
fb42cb16f0
|
move get implementation to virtual as it should not result in register action
|
2014-08-28 08:43:38 +03:00 |
|
Torsten Ruger
|
41de2b5822
|
moved boot_class back to virtual (as things get clearer)
|
2014-08-28 08:24:37 +03:00 |
|
Torsten Ruger
|
7d35732923
|
renamed method definition to compiled method
|
2014-08-28 08:10:33 +03:00 |
|
Torsten Ruger
|
e09d3c2f65
|
adding legth of object itself
|
2014-08-28 08:08:11 +03:00 |
|
Torsten Ruger
|
a71f55f661
|
moved all link functions to a (da da) linker class
|
2014-08-27 21:44:23 +03:00 |
|
Torsten Ruger
|
aad3f7ca15
|
equivalent transformation, just looks
|
2014-08-27 17:23:50 +03:00 |
|
Torsten Ruger
|
fc9615a649
|
short hash, inline like for array. with curly braces off course
|
2014-08-27 14:46:34 +03:00 |
|
Torsten Ruger
|
6343e644b4
|
prepare for short hash, but no change yet
|
2014-08-27 14:42:41 +03:00 |
|
Torsten Ruger
|
97f68a1a54
|
basic assembly frame
|
2014-08-26 22:35:56 +03:00 |
|
Torsten Ruger
|
8f9bbe2f1d
|
fold old link and length into one function
|
2014-08-26 16:36:12 +03:00 |
|
Torsten Ruger
|
1379b4ea4e
|
slightly better enter
|
2014-08-26 16:16:59 +03:00 |
|
Torsten Ruger
|
888acdca0c
|
slightly better enter
|
2014-08-26 16:15:00 +03:00 |
|
Torsten Ruger
|
714cd2a5d6
|
slightly better return implementation
|
2014-08-26 16:12:20 +03:00 |
|
Torsten Ruger
|
dd0674c7dd
|
dummy implementation of enter and return
|
2014-08-26 12:05:49 +03:00 |
|
Torsten Ruger
|
7fd9ff44db
|
simple call implementation
|
2014-08-26 11:58:28 +03:00 |
|
Torsten Ruger
|
a3a55aec08
|
add volotiles in their classes
|
2014-08-26 11:50:43 +03:00 |
|
Torsten Ruger
|
b4419fc438
|
start on linking and assembly (again, hurra)
|
2014-08-25 17:03:39 +03:00 |
|
Torsten Ruger
|
0b65e5840e
|
move space accesor to boot_space
|
2014-08-24 21:32:21 +03:00 |
|
Torsten Ruger
|
dd82095cca
|
reditribute boot dir evenly. some was parfait, some virtual, some kernel
|
2014-08-24 00:25:15 +03:00 |
|
Torsten Ruger
|
5f3b0c1779
|
moved list to parf
|
2014-08-24 00:03:25 +03:00 |
|
Torsten Ruger
|
a7bfb6e6ee
|
rename (corrected) method def to instance methods in class
|
2014-08-23 23:57:47 +03:00 |
|
Torsten Ruger
|
ad6be2676c
|
start on call implementation, getting separation issues
|
2014-08-23 23:37:33 +03:00 |
|
Torsten Ruger
|
594784c729
|
create hard dependency to salama-arm (for now)(as path for now-now)
|
2014-08-23 21:49:52 +03:00 |
|
Torsten Ruger
|
435fefd310
|
implementation passes involving assembly go to register directory
|
2014-08-23 21:49:09 +03:00 |
|
Torsten Ruger
|
495df14e19
|
started coding, but
|
2014-08-23 20:25:19 +03:00 |
|
Torsten Ruger
|
f0efb1e0d9
|
start on implementing set
|
2014-08-23 13:57:14 +03:00 |
|
Torsten Ruger
|
a63e37fc50
|
scaffold for instance variable get implementation
|
2014-08-23 10:59:35 +03:00 |
|
Torsten Ruger
|
0fcb1c8f68
|
move the send to send_implementation, functions to add passes
|
2014-08-23 10:25:55 +03:00 |
|
Torsten Ruger
|
4783e6c326
|
more renaming ripples
|
2014-08-22 18:00:23 +03:00 |
|
Torsten Ruger
|
e398a6b053
|
make space for new passes
|
2014-08-22 17:46:09 +03:00 |
|
Torsten Ruger
|
b196810e89
|
adjusted module name accordingly
|
2014-08-22 17:40:09 +03:00 |
|
Torsten Ruger
|
b100956909
|
renamed
|
2014-08-22 17:27:57 +03:00 |
|
Torsten Ruger
|
f735d6cbc9
|
remove old stuff that i only kept for reference. be gone
|
2014-08-22 17:26:49 +03:00 |
|
Torsten Ruger
|
fd2e717b62
|
remove old boot stuff, was quite same and always mixed them up
|
2014-08-22 15:12:54 +03:00 |
|
Torsten Ruger
|
91ce05364a
|
add FunctionCall instruction and the missing puts (stub)
|
2014-08-22 15:08:46 +03:00 |
|
Torsten Ruger
|
e19b7be111
|
getting to where where the puts should be, but it aint there
|
2014-08-22 10:21:12 +03:00 |
|
Torsten Ruger
|
b305a56576
|
more work on send
|
2014-08-22 09:21:59 +03:00 |
|
Torsten Ruger
|
5b1e86da49
|
more work on send, remove yaml hack in test
|
2014-08-21 22:57:20 +03:00 |
|
Torsten Ruger
|
2260c680b2
|
getting the passes back and starting on send
|
2014-08-21 17:46:12 +03:00 |
|
Torsten Ruger
|
3915f5b7f9
|
fix the missing reference bug on class
|
2014-08-21 15:35:55 +03:00 |
|
Torsten Ruger
|
0677069fc0
|
fix folded array bug by using object_id, fix ref bug but only counting first
|
2014-08-21 15:21:20 +03:00 |
|
Torsten Ruger
|
9608e5f626
|
supressing nil attributes on objects
|
2014-08-20 22:33:08 +03:00 |
|
Torsten Ruger
|
1371d395ec
|
pretty much redid the variable idea (now slot)
|
2014-08-20 17:14:52 +03:00 |
|
Torsten Ruger
|
d401327319
|
made a simple node for small objects. bad news is that tests pass unchanged
|
2014-08-19 23:16:40 +03:00 |
|
Torsten Ruger
|
8ff55fdb1f
|
that make four (times of identical == definitions)
|
2014-08-19 23:03:39 +03:00 |
|
Torsten Ruger
|
52ca7110c3
|
ad a preliminary syntax for class objects, which is just the class name
|
2014-08-19 23:01:19 +03:00 |
|
Torsten Ruger
|
a7dc60e638
|
just formatting
|
2014-08-19 22:57:08 +03:00 |
|
Torsten Ruger
|
dd59a2f9c6
|
remove unused attributes() boilerplate
|
2014-08-19 22:54:28 +03:00 |
|
Torsten Ruger
|
4b17a1e58f
|
use the sof attributes for equality
|
2014-08-19 22:40:28 +03:00 |
|
Torsten Ruger
|
28b4344ef9
|
make attributes available outside sof (iw as module funtion)
|
2014-08-19 22:39:58 +03:00 |
|
Torsten Ruger
|
9d5f62eded
|
only marking/counting occurences that are actually referenced, so numbers stay smaller
|
2014-08-18 17:25:49 +03:00 |
|
Torsten Ruger
|
e13801c764
|
moving (back) to 1.9 style hash, clearer that it is an association. didnt like the double colon
|
2014-08-18 17:19:34 +03:00 |
|
Torsten Ruger
|
81f8f0f3a2
|
actually using volotile attributes and outputting sof in test. very readable
|
2014-08-18 17:16:18 +03:00 |
|
Torsten Ruger
|
a594b716bc
|
inlining references into objects as simple data
|
2014-08-18 14:54:03 +03:00 |
|
Torsten Ruger
|
a874bd49d2
|
short version for array
|
2014-08-18 14:28:28 +03:00 |
|
Torsten Ruger
|
1dee9a4bd1
|
adding the actual references for referenced objects
|
2014-08-18 13:53:05 +03:00 |
|
Torsten Ruger
|
338c669a00
|
fix level bug that became obvous with recursion
|
2014-08-18 13:33:40 +03:00 |
|
Torsten Ruger
|
ad4aaaff8a
|
fix recursive arrays
|
2014-08-18 13:22:03 +03:00 |
|
Torsten Ruger
|
99e0c0db18
|
cleanup
|
2014-08-18 13:01:52 +03:00 |
|
Torsten Ruger
|
9f292ba618
|
fix weird object bug
|
2014-08-18 12:49:38 +03:00 |
|
Torsten Ruger
|
a3c9ab7e29
|
simpler but more verbose node model fixes everything but one
|
2014-08-18 08:19:48 +03:00 |
|
Torsten Ruger
|
b0472753f4
|
fixing arrays/hashs and starting complex objects
|
2014-08-17 21:44:34 +03:00 |
|
Torsten Ruger
|
9669831f78
|
fix all existing (hash) tests
|
2014-08-16 15:16:07 +03:00 |
|
Torsten Ruger
|
90e4837b2e
|
broaden the node hierachy
|
2014-08-16 12:34:25 +03:00 |
|
Torsten Ruger
|
2f84c0dfa6
|
fixing array tests, seperated nodes into different types
|
2014-08-16 11:43:41 +03:00 |
|
Torsten Ruger
|
7f7a174554
|
fixes object
|
2014-08-16 09:56:11 +03:00 |
|
Torsten Ruger
|
a10321922e
|
add transformation step to tree before output to help with the logic
|
2014-08-15 22:29:48 +03:00 |
|
Torsten Ruger
|
b0a54cb8c2
|
working up
|
2014-08-15 18:27:32 +03:00 |
|
Torsten Ruger
|
0a7814a07b
|
add hash with object
|
2014-08-15 17:18:15 +03:00 |
|
Torsten Ruger
|
16261f96b0
|
adds simple hash and test
|
2014-08-15 17:14:49 +03:00 |
|
Torsten Ruger
|
716bc93e4a
|
test for array with array
|
2014-08-15 15:04:13 +03:00 |
|
Torsten Ruger
|
198e70b6bd
|
fix array with object
|
2014-08-15 14:59:38 +03:00 |
|
Torsten Ruger
|
85dad14cc8
|
fix simple array
|
2014-08-14 20:24:26 +03:00 |
|
Torsten Ruger
|
2f5ed43073
|
move from known attributes to volotile (white to blacklist)
|
2014-08-14 20:04:15 +03:00 |
|
Torsten Ruger
|
6b19b915a1
|
rewrote write to use known attributes or instance variables, simple values inline
|
2014-08-14 19:49:20 +03:00 |
|
Torsten Ruger
|
7eeb269d50
|
fixed scope
|
2014-08-14 19:48:26 +03:00 |
|
Torsten Ruger
|
519283a034
|
moved utility functions to own module (used from members and writer)
|
2014-08-14 19:48:06 +03:00 |
|
Torsten Ruger
|
0a33f940cf
|
moving away from the attributes aproach, tests fixed
|
2014-08-14 19:24:18 +03:00 |
|
Torsten Ruger
|
2c2ae14928
|
getting some sof output and adding some tests. issues though. abound
|
2014-08-14 17:40:56 +03:00 |
|
Torsten Ruger
|
7e60827dd3
|
redoing the ifs with new (old) block structure
|
2014-08-13 20:05:32 +03:00 |
|
Torsten Ruger
|
90cbeddc0a
|
premature start on the salama object files, just for reading the compiled code
|
2014-08-13 20:05:00 +03:00 |
|
Torsten Ruger
|
200228a33d
|
adding the blocks to virtual machine and store instructions in array not list
|
2014-08-13 11:59:51 +03:00 |
|
Torsten Ruger
|
c2ae184e6e
|
simple test for get type
|
2014-08-07 15:41:13 +03:00 |
|
Torsten Ruger
|
a9ab3ca13e
|
forgot to add compiled methods to the class, fixed
|
2014-08-07 15:37:32 +03:00 |
|
Torsten Ruger
|
b9e259e11a
|
first ginger parfait test
|
2014-08-06 18:49:20 +03:00 |
|
Torsten Ruger
|
9a197ff7c1
|
expanded the send a bit
|
2014-08-06 18:37:19 +03:00 |
|
Torsten Ruger
|
ce3505710a
|
basic send
|
2014-08-05 15:55:24 +03:00 |
|
Torsten Ruger
|
e92f949a71
|
fix the vm in link
|
2014-07-31 21:55:54 +03:00 |
|
Torsten Ruger
|
8effcc866a
|
more machinery to the machine
|
2014-07-30 21:43:12 +03:00 |
|
Torsten Ruger
|
5add9c42f2
|
juggle into the machine
|
2014-07-30 21:07:48 +03:00 |
|
Torsten Ruger
|
7b6f364ba8
|
namechange
|
2014-07-29 18:33:11 +03:00 |
|
Torsten Ruger
|
da9a57b3cf
|
delete some files i had kept for reference
|
2014-07-28 12:59:43 +03:00 |
|
Torsten Ruger
|
8718ebf476
|
last inherited test
|
2014-07-27 10:09:31 +03:00 |
|
Torsten Ruger
|
1a95835442
|
adds message get and set instructions
|
2014-07-25 20:28:38 +03:00 |
|
Torsten Ruger
|
7df1490da8
|
mostly comments
|
2014-07-25 11:48:06 +03:00 |
|
Torsten Ruger
|
8d7b353f33
|
pass message to compile, not frame
|
2014-07-25 10:49:34 +03:00 |
|
Torsten Ruger
|
13a05e7b72
|
comments and cosmetics
|
2014-07-24 21:56:31 +03:00 |
|
Torsten Ruger
|
e427bcef43
|
change method and frame around in calling, easier to understand static first
|
2014-07-24 14:56:27 +03:00 |
|
Torsten Ruger
|
e408b0e4b9
|
fixed while instruciton linking after change in method add
|
2014-07-22 23:27:13 +03:00 |
|
Torsten Ruger
|
eb44011177
|
fixed that branch numbering bug
|
2014-07-19 21:15:27 +03:00 |
|
Torsten Ruger
|
c03c4f9cc9
|
add return instruction and fix the tests
|
2014-07-18 11:56:46 +03:00 |
|
Torsten Ruger
|
2e79caa791
|
using yaml as the storage format of the result as it handles graphs out of the box
|
2014-07-18 00:30:36 +03:00 |
|
Torsten Ruger
|
98db88ac2f
|
not recursing into labels to avoid infinite loops
|
2014-07-18 00:29:45 +03:00 |
|
Torsten Ruger
|
e02c6ed082
|
codes the while, but the testing throws stack too deep because loop detection is missing
|
2014-07-17 16:46:17 +03:00 |
|
Torsten Ruger
|
f00fa98818
|
fixed import
|
2014-07-17 03:01:34 +03:00 |
|
Torsten Ruger
|
337b1a8ee0
|
renamed to kide(crystal)
|
2014-07-17 02:26:13 +03:00 |
|
Torsten Ruger
|
fb105cb895
|
had to let go of crystal (sniff) as the name was taken
|
2014-07-17 01:00:15 +03:00 |
|
Torsten Ruger
|
f8e3f17660
|
split frame into message (caller) and frame (receiver)
|
2014-07-17 00:53:19 +03:00 |
|
Torsten Ruger
|
58298ab62b
|
some cleaning of scratches
|
2014-07-16 22:36:24 +03:00 |
|
Torsten Ruger
|
efeb910843
|
move branch counter to branch instruction (from if) in preperation of while
|
2014-07-16 22:28:28 +03:00 |
|
Torsten Ruger
|
7534626d87
|
fix the if test by naming branch and label and stitching them in constructor
|
2014-07-16 21:16:08 +03:00 |
|
Torsten Ruger
|
ba15f352db
|
gets the if coded, but test fail die to instruction being a graph now
|
2014-07-16 20:16:40 +03:00 |
|
Torsten Ruger
|
4185758532
|
slight rename tremours
|
2014-07-16 20:16:10 +03:00 |
|
Torsten Ruger
|
1ff7ae2b0a
|
rename method
|
2014-07-16 19:24:41 +03:00 |
|
Torsten Ruger
|
55cb6bd2d6
|
working on if
|
2014-07-16 13:20:47 +03:00 |
|
Torsten Ruger
|
3a152c1295
|
adds self to sends args
|
2014-07-15 18:34:03 +03:00 |
|
Torsten Ruger
|
4d725ea1ae
|
adds explicit load_self instruction
|
2014-07-15 18:27:13 +03:00 |
|
Torsten Ruger
|
930740e1db
|
fixes the tests after fixing hierarchy
|
2014-07-15 10:35:29 +03:00 |
|
Torsten Ruger
|
49f73c090d
|
fixed tests because of inheritance changes
|
2014-07-15 09:34:45 +03:00 |
|
Torsten Ruger
|
bb051230f4
|
fixed relation of values and types that had got watered in the virtual move
|
2014-07-15 09:31:25 +03:00 |
|
Torsten Ruger
|
102c5c2327
|
remove singletons and make them constants
|
2014-07-15 09:15:04 +03:00 |
|
Torsten Ruger
|
3ca61d54eb
|
fixes constant to be values not object. interestingly tests still pass
|
2014-07-15 09:12:51 +03:00 |
|
Torsten Ruger
|
9891da88a4
|
fix all tests
|
2014-07-15 00:00:00 +03:00 |
|
Torsten Ruger
|
b59a9da34e
|
reduce method return type to type and introduce a single instruction for instance get
|
2014-07-14 21:28:21 +03:00 |
|
Torsten Ruger
|
16a378e3da
|
fix class function test
|
2014-07-14 17:08:52 +03:00 |
|
Torsten Ruger
|
93bdd8a243
|
removing exceptions
|
2014-07-14 16:19:47 +03:00 |
|
Torsten Ruger
|
c7c4387e16
|
adds self reference and improve methods a little
|
2014-07-14 14:29:33 +03:00 |
|
Torsten Ruger
|
db8b1488d0
|
function test, slow but steady
|
2014-07-14 14:06:09 +03:00 |
|
Torsten Ruger
|
d531a24930
|
first method test
|
2014-07-14 11:29:38 +03:00 |
|
Torsten Ruger
|
c1f475070b
|
and another one, and another one....
|
2014-07-13 16:00:48 +03:00 |
|
Torsten Ruger
|
ae21863245
|
one more basic test back online
|
2014-07-13 14:12:43 +03:00 |
|
Torsten Ruger
|
dc6cb2bb52
|
a lot of work to get one more test to pass
|
2014-07-12 21:59:17 +03:00 |
|
Torsten Ruger
|
842c4e3044
|
copied old boot for later reference
|
2014-07-12 21:18:45 +03:00 |
|
Torsten Ruger
|
c505db490f
|
brainstorming mode on the new way (tm)
|
2014-07-10 17:14:38 +03:00 |
|
Torsten Ruger
|
ee5615ec03
|
fix rename
|
2014-07-01 19:12:32 +03:00 |
|
Torsten Ruger
|
f74999af57
|
zwischenstopp
|
2014-07-01 18:58:25 +03:00 |
|
Torsten Ruger
|
7045a4b256
|
update reader and implement singletons
|
2014-07-01 15:57:13 +03:00 |
|
Torsten Ruger
|
94d1140686
|
remove intel as it is in own rep now
|
2014-06-30 15:34:51 +03:00 |
|
Torsten Ruger
|
84d27ce9d9
|
remove arm as it is in own rep now
|
2014-06-30 15:28:39 +03:00 |
|
Torsten Ruger
|
1e866ae0ae
|
minor
|
2014-06-30 14:56:58 +03:00 |
|
Torsten Ruger
|
18faeeb042
|
add the idea of a frame
|
2014-06-29 19:05:35 +03:00 |
|
Torsten Ruger
|
16ceb2a60d
|
hurra, a first test. looks a lot.... but lets not spoil th efeeling
|
2014-06-26 18:39:02 +03:00 |
|
Torsten Ruger
|
525f9d45c5
|
rename
|
2014-06-26 17:52:15 +03:00 |
|
Torsten Ruger
|
33c62a7db1
|
update reader
|
2014-06-26 17:48:33 +03:00 |
|
Torsten Ruger
|
9d0d5aa431
|
update reader
|
2014-06-26 11:34:48 +03:00 |
|
Torsten Ruger
|
b9ddd75a33
|
rewrote with ternary operator for conciseness
|
2014-06-25 16:03:39 +03:00 |
|
Torsten Ruger
|
d28df7671d
|
add the simplest possible hash replacement with tests
|
2014-06-25 16:00:24 +03:00 |
|
Torsten Ruger
|
5c887846f0
|
updates
|
2014-06-25 15:59:22 +03:00 |
|
Torsten Ruger
|
fe337fad79
|
rename and a tiny start
|
2014-06-25 15:20:46 +03:00 |
|
Torsten Ruger
|
e41bb8027d
|
copies of the old code to start the new layer
|
2014-06-25 02:47:59 +03:00 |
|
Torsten Ruger
|
9b39a3a816
|
renaming, making space for extra layer
|
2014-06-25 02:33:44 +03:00 |
|
Torsten Ruger
|
3771f44e62
|
just moving code around
|
2014-06-24 19:34:36 +03:00 |
|
Torsten Ruger
|
98de7404ef
|
named syscall register
|
2014-06-24 12:40:49 +03:00 |
|
Torsten Ruger
|
17904d8e02
|
rename blocks do_add to be the same as sunctions add_code to blur the difference
|
2014-06-24 12:36:32 +03:00 |
|
Torsten Ruger
|
43a2649635
|
new list test and debugs
|
2014-06-24 12:25:03 +03:00 |
|
Torsten Ruger
|
b8b1d98a7c
|
towards rubys true definition
|
2014-06-24 12:24:36 +03:00 |
|
Torsten Ruger
|
bc89da0bc1
|
instance setter
|
2014-06-24 12:23:58 +03:00 |
|
Torsten Ruger
|
07b98d684a
|
more on method lookup
|
2014-06-24 12:23:39 +03:00 |
|
Torsten Ruger
|
98e25abf8e
|
broaden ifs possibilities
|
2014-06-24 12:22:32 +03:00 |
|
Torsten Ruger
|
25c5b2da6e
|
more setter work
|
2014-06-24 12:20:59 +03:00 |
|
Torsten Ruger
|
dc198ac79f
|
more setter work
|
2014-06-24 12:20:38 +03:00 |
|
Torsten Ruger
|
9251bab507
|
add setter and remove debug
|
2014-06-24 12:20:10 +03:00 |
|
Torsten Ruger
|
a859951a8f
|
slight cleanup and rename test case
|
2014-06-17 14:25:33 +02:00 |
|
Torsten Ruger
|
7d05b7c42f
|
adds plocks (Proc Block) as descibed in posts. Usage also described, but not coded yet
|
2014-06-17 01:01:00 +02:00 |
|
Torsten Ruger
|
a68d84a781
|
introducing references
|
2014-06-14 23:48:12 +03:00 |
|
Torsten Ruger
|
4db54a760e
|
gives values their own directory and seperate files
|
2014-06-14 21:29:57 +03:00 |
|
Torsten Ruger
|
87fa71277a
|
some inlining and renaming
|
2014-06-14 11:12:53 +03:00 |
|
Torsten Ruger
|
0dbaebf647
|
fix all tests and a little cleaning
|
2014-06-14 10:59:25 +03:00 |
|
Torsten Ruger
|
2c26415de7
|
transformations according to todays post
|
2014-06-14 00:19:12 +03:00 |
|
Torsten Ruger
|
12a92e4db0
|
move boot* classes to boot directory
|
2014-06-13 23:51:53 +03:00 |
|
Torsten Ruger
|
a7551ea8b6
|
still working on the method dispatch
|
2014-06-13 23:41:45 +03:00 |
|
Torsten Ruger
|
017d93d929
|
add to_asm debug output functions
|
2014-06-12 21:40:25 +03:00 |
|
Torsten Ruger
|
dcd691fe00
|
minor
|
2014-06-12 21:27:47 +03:00 |
|
Torsten Ruger
|
6d6c7ddb68
|
register assignment fix (was not taking subsequent calls into account)
|
2014-06-12 21:27:30 +03:00 |
|
Torsten Ruger
|
200da192b4
|
improve output
|
2014-06-12 21:04:15 +03:00 |
|
Torsten Ruger
|
ea0572c836
|
fixed while compilation (block order) and fixed and improved fibo
|
2014-06-12 16:23:57 +03:00 |
|
Torsten Ruger
|
8da1bc4645
|
fix putint (too eager optimization broke it)
|
2014-06-12 13:47:06 +03:00 |
|
Torsten Ruger
|
506f98da5a
|
fixed foo and hello, next putint
|
2014-06-12 09:07:03 +03:00 |
|
Torsten Ruger
|
eef6744827
|
fixes the if test (regs again)
|
2014-06-12 08:34:46 +03:00 |
|
Torsten Ruger
|
b125a7c5c7
|
fix passes, add noop reduction, remove the wretched value operators
|
2014-06-11 21:36:22 +03:00 |
|
Torsten Ruger
|
4e6319b753
|
inrtoduce block passes. move the allocation there and implement those simple optimisations
|
2014-06-11 11:41:50 +03:00 |
|
Torsten Ruger
|
7cca50cd3a
|
still recoving from previous block - function change. no more exceptions at least
|
2014-06-11 00:38:46 +03:00 |
|
Torsten Ruger
|
e9519d4f05
|
move the code insertion functionality up to function. makes more sense. block still carries code though
|
2014-06-10 23:57:56 +03:00 |
|
Torsten Ruger
|
e9fc8ac6aa
|
making the third arg of block init explicit (not optional)
|
2014-06-10 18:51:27 +03:00 |
|
Torsten Ruger
|
7ca3207b3e
|
moved registers to machine, changed return to 0 (from 7) and erased all integer references to registers
|
2014-06-10 13:29:01 +03:00 |
|
Torsten Ruger
|
d7a60f2803
|
new register allocation generates good looking push/pop
|
2014-06-09 19:24:09 +03:00 |
|
Torsten Ruger
|
b66c4157d5
|
keep track of used and assigned registers for each block
|
2014-06-08 01:41:56 +03:00 |
|
Torsten Ruger
|
fbcfa844de
|
renaming and small fixes
|
2014-06-08 00:56:40 +03:00 |
|
Torsten Ruger
|
e7bb774da0
|
fix block insert ordering with depth > 1
|
2014-06-08 00:56:15 +03:00 |
|
Torsten Ruger
|
42a840614e
|
adding call counter and splitting block after call
|
2014-06-08 00:55:18 +03:00 |
|
Torsten Ruger
|
0a14cffefb
|
fixing fragment tests, most done
|
2014-06-07 23:22:32 +03:00 |
|
Torsten Ruger
|
6b715bbb1b
|
remoe hash attributes (less magic) and make attributes on context explicit
|
2014-06-07 22:41:02 +03:00 |
|
Torsten Ruger
|
36f237c633
|
removed the (too) fancy dsl. Also introduce register indirection
|
2014-06-07 17:59:44 +03:00 |
|
Torsten Ruger
|
6433a394e7
|
adding receiver and a register abstraction
|
2014-06-06 21:49:03 +03:00 |
|
Torsten Ruger
|
c59f22f11f
|
first oo program to compile. But no worries, there is still work left to be done
|
2014-06-05 18:17:00 +03:00 |
|
Torsten Ruger
|
e6e969b4e4
|
a spirited effort to make assembly repeatable
|
2014-06-05 10:46:42 +03:00 |
|
Torsten Ruger
|
41a02a7190
|
small step to making the assmebly process repeatable (is destructive at the moment)
|
2014-06-05 10:28:53 +03:00 |
|
Torsten Ruger
|
7cc4c6344c
|
remove the parse code and fix the rest to work with the gem (from git for now)
|
2014-06-04 22:03:45 +03:00 |
|
Nigel Thorne
|
5145d21e37
|
Merge branch 'master' of https://github.com/ruby-in-ruby/crystal
|
2014-06-04 21:49:06 +10:00 |
|
Nigel Thorne
|
20433e3ad2
|
Change to NigelThorne fork to detect infinite loops
and fixed grammar to ignore missing parameter list.
|
2014-06-04 21:48:32 +10:00 |
|
Torsten Ruger
|
72d4adc7af
|
another step closer to a working oo system
|
2014-06-03 22:16:57 +03:00 |
|
Torsten Ruger
|
ca19f5cb16
|
move to syms for names
|
2014-06-03 20:47:06 +03:00 |
|
Torsten Ruger
|
b7c2089046
|
the further down this goes, the smaller the circles. Soon the point will come. And then back out
|
2014-06-03 14:49:02 +03:00 |
|
Torsten Ruger
|
88a26414eb
|
change the debug output to be more readable
|
2014-06-02 15:11:48 +03:00 |
|
Torsten Ruger
|
7c1c5431bc
|
add qualification to function definitions
|
2014-06-02 14:00:30 +03:00 |
|
Torsten Ruger
|
1cff296ab5
|
small fixes, wown parse for class test
|
2014-06-02 13:45:08 +03:00 |
|
Torsten Ruger
|
83d4ce55ca
|
fix the load memory instruction
|
2014-06-01 22:06:59 +03:00 |
|
Torsten Ruger
|
31a55b07ac
|
makes memory a three operand instruction, like add etc. But 3 regs are still undone
|
2014-06-01 21:20:44 +03:00 |
|
Torsten Ruger
|
08bbad0fdc
|
more on classes, have to work on asm next
|
2014-06-01 21:03:08 +03:00 |
|
Torsten Ruger
|
1d10c2c03e
|
had forgotten calls on instance variables. corrected + tests
|
2014-06-01 14:46:16 +03:00 |
|
Torsten Ruger
|
9ea0acf2e3
|
first oo steps are wobbly, but a string.plus parses
|
2014-06-01 14:24:54 +03:00 |
|
Torsten Ruger
|
86431120d5
|
add also calls on classes and more tests for that
|
2014-05-31 17:58:26 +03:00 |
|
Torsten Ruger
|
4038bd331a
|
clean up block names and export of qualified names makes assembler nicer to read
|
2014-05-31 17:02:55 +03:00 |
|
Torsten Ruger
|
5756e0b325
|
move that test to core (cant be done in compiled code) and focus on string addition instead
|
2014-05-31 16:43:03 +03:00 |
|
Torsten Ruger
|
cdfc1ac891
|
kernel functions are not fixed to be Object functions
|
2014-05-31 16:19:44 +03:00 |
|
Torsten Ruger
|
a6f02d6be3
|
let the BootClasses carry functions, ie one level squeezed between object_space and funtion, the class is coming to life
|
2014-05-31 14:35:33 +03:00 |
|
Torsten Ruger
|
3713d08748
|
renamed program to boot_space, as in object_space at boot time. thats the way its going
|
2014-05-31 12:52:29 +03:00 |
|
Torsten Ruger
|
c9c484f353
|
change program to inherit stright from code, not block (as it keeps the funcitons anyway)
|
2014-05-31 12:38:15 +03:00 |
|
Torsten Ruger
|
3156887a81
|
add instance variables and module name as basic types (as name was there already) and add tests
|
2014-05-30 14:25:08 +03:00 |
|
Torsten Ruger
|
806960a4d6
|
fixing module and class rules to actually use module names. fix all tests
|
2014-05-30 12:17:11 +03:00 |
|
Torsten Ruger
|
f03d445f3d
|
add module names and instance variables as parse rules
|
2014-05-30 12:06:42 +03:00 |
|
Torsten Ruger
|
3e93517986
|
adds class definition with tests
|
2014-05-30 10:59:49 +03:00 |
|
Torsten Ruger
|
e7a823bf3e
|
renamed module_def too module_definition and fixed leading space tests
|
2014-05-30 10:42:43 +03:00 |
|
Torsten Ruger
|
caec5ee6f0
|
add module to root parse and tests
|
2014-05-30 10:31:25 +03:00 |
|
Torsten Ruger
|
c69a44f316
|
define modules and tests, no compiling
|
2014-05-29 15:57:33 +03:00 |
|
Torsten Ruger
|
25cd80c76b
|
small fix to return gets recursive fibonacchi to work
|
2014-05-28 20:13:03 +03:00 |
|
Torsten Ruger
|
4186c9cafe
|
add <= operator for fibo
|
2014-05-28 20:10:16 +03:00 |
|
Torsten Ruger
|
5c0f62ebb9
|
upgrade calls with operator argument and chaining. Almost feels like cheating, too easy
|
2014-05-28 15:22:37 +03:00 |
|
Torsten Ruger
|
0f118c591d
|
fix return compilation and use it on the while fibo. worked immediately :-)
|
2014-05-28 15:03:54 +03:00 |
|
Torsten Ruger
|
5a415aed92
|
fix fragment tests to actually execute on the pi and check the output
|
2014-05-28 14:55:13 +03:00 |
|
Torsten Ruger
|
e9720c4c54
|
padding with space not zero
|
2014-05-28 14:27:37 +03:00 |
|
Torsten Ruger
|
07ef170db0
|
padding with space not zero
|
2014-05-28 14:26:24 +03:00 |
|
Torsten Ruger
|
6bfe643032
|
add some return test to functions
|
2014-05-27 16:51:37 +03:00 |
|
Torsten Ruger
|
fbaf292bb6
|
add a simple return, ie the normal kind, not with trailing statements
|
2014-05-27 16:33:24 +03:00 |
|
Torsten Ruger
|
21a53c6a7f
|
fix the compound type parser tests
|
2014-05-27 15:41:34 +03:00 |
|
Torsten Ruger
|
0b07e77782
|
fix the spurious root expression and add conmound types back (thanks to kasper for fixing that)
|
2014-05-27 15:36:51 +03:00 |
|
Torsten Ruger
|
1f17262887
|
fix the handcoded fibonacci (registers again)
|
2014-05-25 13:34:06 +03:00 |
|
Torsten Ruger
|
5afa6f4239
|
move the if logic around (execute false first) and fix the parameters passing
|
2014-05-25 11:35:45 +03:00 |
|
Torsten Ruger
|
5a5b016a7e
|
use crystal calling convention, documented in readme
|
2014-05-25 10:57:56 +03:00 |
|
Torsten Ruger
|
6ac92cac3a
|
working on registers, awip (a work in progress)
|
2014-05-25 08:43:07 +03:00 |
|
Torsten Ruger
|
1e326e00b9
|
fix tests after register allocation work
|
2014-05-24 16:52:54 +03:00 |
|
Torsten Ruger
|
4a67504a61
|
remove parslet, bundling now
|
2014-05-24 14:51:50 +03:00 |
|
Torsten Ruger
|
61a60abd08
|
ridiculously easy to implement the if now
|
2014-05-24 10:41:57 +03:00 |
|
Torsten Ruger
|
00d85156da
|
rename conditional to if expression
|
2014-05-24 10:18:54 +03:00 |
|
Torsten Ruger
|
2c90006697
|
that fixes the while. To work. Actually work. Fibonacci and all :-)
|
2014-05-23 20:27:14 +03:00 |
|
Torsten Ruger
|
86e73bf1ba
|
save and restore the right registers
|
2014-05-22 21:55:17 +03:00 |
|
Torsten Ruger
|
4f0b769e82
|
get conditions to work for while
|
2014-05-22 21:38:57 +03:00 |
|
Torsten Ruger
|
7c2d149106
|
solves control flow issue when adding blocks
|
2014-05-22 16:35:59 +03:00 |
|
Torsten Ruger
|
8596fb312d
|
while coded
|
2014-05-22 14:56:31 +03:00 |
|
Torsten Ruger
|
ccf88319e0
|
gives function the list of blocks it needs for branching and documents also the blocks better
|
2014-05-22 14:18:22 +03:00 |
|
Torsten Ruger
|
cf87c5323d
|
using the next field of blocks for a consecutive code line
|
2014-05-22 13:59:47 +03:00 |
|
Torsten Ruger
|
e3bccaa0fe
|
thats putstring working again (better testing == better code => better sleep, longer life :-)
|
2014-05-21 21:27:05 +03:00 |
|
Torsten Ruger
|
587fd56300
|
remove a layer of indirection
|
2014-05-21 21:15:23 +03:00 |
|
Torsten Ruger
|
bc278a61eb
|
using function args for call
|
2014-05-21 21:12:46 +03:00 |
|
Torsten Ruger
|
65cde70114
|
add space at file end
|
2014-05-21 21:08:15 +03:00 |
|
Torsten Ruger
|
46102e56ad
|
rename c to register machine
|
2014-05-21 19:43:46 +03:00 |
|
Torsten Ruger
|
937f566b27
|
value is not derived from code (was too much generalisation/confusing)
|
2014-05-21 19:41:51 +03:00 |
|
Torsten Ruger
|
067cde8d43
|
remove remnant of old dsl
|
2014-05-21 19:34:58 +03:00 |
|
Torsten Ruger
|
c36a08d52d
|
small fixes
|
2014-05-21 19:33:58 +03:00 |
|
Torsten Ruger
|
b281c24a39
|
move towards locals (not hardcoding registers)
|
2014-05-21 19:27:27 +03:00 |
|