changed %(, %[, %{ to ##(, ##[, ##{ respectively

put back % into is_binselchar().
attempting to support a string-like byte array literal - B"XXXX"
This commit is contained in:
hyunghwan.chung
2019-06-27 07:43:17 +00:00
parent fcb987891e
commit ea4d782c1d
13 changed files with 147 additions and 97 deletions

View File

@ -1284,7 +1284,7 @@ class Dictionary(AssociativeCollection)
{
/* [NOTE]
* VM require Dictionary to implement new: and __put_assoc
* for the dictionary expression notation - %{ }
* for the dictionary expression notation - ##{ }
*/
// TODO: implement Dictionary as a Hashed List/Table or Red-Black Tree
@ -1299,7 +1299,7 @@ class Dictionary(AssociativeCollection)
* to a dictionary with the dictionary/association expression notation
* like this:
*
* %{ 1 -> 20, #moo -> 999 }
* ##{ 1 -> 20, #moo -> 999 }
*
* it must return self for the way VM works.
*/

View File

@ -221,7 +221,7 @@ class Fcgi.ParamRecord(Fcgi.Record)
{
//# TODO: implement this...
/*
(aString subStrings: %(char)) do: [:each |
(aString subStrings: ##(char)) do: [:each |
equal := each indexOf: $=.
equal = 0
ifTrue: [tempFields at: each put: nil]
@ -737,7 +737,7 @@ class MyObject(Object)
fcgi := FcgiServer new.
[
| ss |
fcgi start: %(
fcgi start: ##(
SocketAddress fromString: ('[::]:' & base_port asString),
SocketAddress fromString: ('0.0.0.0:' & (base_port + 1) asString)
).
@ -783,7 +783,7 @@ fcgi connect: addr.
fcgi := FcgiServer new.
[
| ss |
fcgi start: %(
fcgi start: ##(
SocketAddress fromString: '[::]:7777',
SocketAddress fromString: '0.0.0.0:7776'
).
@ -811,7 +811,7 @@ fcgi connect: addr.
[
fcgi := FcgiServer new.
[
fcgi start: %(
fcgi start: ##(
SocketAddress fromString: '[::]:7777',
SocketAddress fromString: '0.0.0.0:7776'
).

View File

@ -420,7 +420,7 @@ class MyObject(Object)
httpd := HttpServer new.
[
| ss |
httpd start: %(
httpd start: ##(
SocketAddress fromString: ('[::]:' & base_port asString),
SocketAddress fromString: ('0.0.0.0:' & (base_port + 1) asString)
).
@ -462,7 +462,7 @@ httpd connect: addr.
httpd := HttpServer new.
[
| ss |
httpd start: %(
httpd start: ##(
SocketAddress fromString: '[::]:7777',
SocketAddress fromString: '0.0.0.0:7776'
).
@ -490,7 +490,7 @@ httpd connect: addr.
[
httpd := HttpServer new.
[
httpd start: %(
httpd start: ##(
SocketAddress fromString: '[::]:7777',
SocketAddress fromString: '0.0.0.0:7776'
).

View File

@ -217,19 +217,19 @@ class MyObject(Object)
a :=999.
a := %(
a := ##(
1,
2,
a,
4,
1 + 1,
%( 1, 2, %(a, a := a + 1, a, if (a > 10) { a + 20 } ), 3),
##( 1, 2, ##(a, a := a + 1, a, if (a > 10) { a + 20 } ), 3),
2 + 2,
#'a b c'
).
/* Dictionary ???
a := %{
a := ##{
key -> value ,
key -> value ,
key -> value ,
@ -275,7 +275,7 @@ class MyObject(Object)
}.*/
a := %{
a := ##{
'aaa' -> 10,
'bbb' -> 20,
'bbb' -> 30,
@ -365,6 +365,6 @@ a free.
/*
pooldic XXD {
#abc := #(1 2 3).
#def := %( 1, 3, 4 ). // syntax error - literal expected where %( is
#def := ##( 1, 3, 4 ). // syntax error - literal expected where ##( is
}
*/

View File

@ -611,7 +611,7 @@ extend X11
at: self.LLEventType.CONFIGURE_NOTIFY put: #__handle_configure_notify:on:;
at: self.LLEventType.CLIENT_MESSAGE put: #__handle_client_message:on:.
*/
self.llevent_blocks := %{
self.llevent_blocks := ##{
self.LLEventType.KEY_PRESS -> #__handle_key_event:on:,
self.LLEventType.KEY_RELEASE -> #__handle_key_event:on:,
self.LLEventType.BUTTON_PRESS -> #__handle_button_event:on:,

View File

@ -161,7 +161,7 @@ extend MyObject
{
| tc limit |
tc := %(
tc := ##(
// 0 - 4
[MyObject.Donkey v == 901982],
[selfns.MyObject.Donkey v == 901982],
@ -396,7 +396,7 @@ extend MyObject
[
| k |
k := String new.
(%( 1 + 2, -21391239218392 * +291382913821, 19p10 div: 3 ) asOrderedCollection) doWithIndex: [:each :index | k := k & (index asString) & '=>' & (each asString) & ' '. ].
(##( 1 + 2, -21391239218392 * +291382913821, 19p10 div: 3 ) asOrderedCollection) doWithIndex: [:each :index | k := k & (index asString) & '=>' & (each asString) & ' '. ].
k = '0=>3 1=>-6233041613697111534195832 2=>3.3333333333333333333 '.
],

View File

@ -126,7 +126,7 @@ class MyObject(Object)
sem wait.
sem wait.
^%( v, p ) // v must be 2000, p must be 6000
^##( v, p ) // v must be 2000, p must be 6000
}
/*
@ -154,10 +154,10 @@ class MyObject(Object)
{
| tc limit |
tc := %(
tc := ##(
// 0 - 4
[ (self test_quicksort: #(7 12 3 20 5 8 2) copy) = #(2 3 5 7 8 12 20)],
[ (self test_quicksort: %(99, 12, 18, 7, 12, 3, 20, 5, 8, 2)) = #(2 3 5 7 8 12 12 18 20 99)],
[ (self test_quicksort: ##(99, 12, 18, 7, 12, 3, 20, 5, 8, 2)) = #(2 3 5 7 8 12 12 18 20 99)],
[ (self test_on_do_with: 10 with: 2) == 5 ],
[ (self test_on_do_with: -10 with: 0) == 0 ],
[ self test_ensure_with: -20945. self.ensure_tester_v == -20945 ],

View File

@ -34,7 +34,7 @@ class MyObject(Object)
rec := [ :y :z | 22p108 - (18p815 - (16p1500 div: z) div: y) ].
// results := %( 4.0, 425 div: 100.0 ) asOrderedCollection.
// results := ##( 4.0, 425 div: 100.0 ) asOrderedCollection.
results := OrderedCollection new.
results add: 4.0; add: (425.00 div: 100.00).
@ -56,7 +56,7 @@ class MyObject(Object)
{
| tc limit |
tc := %(
tc := ##(
// 0 - 4
[(Object isKindOf: Class) == true],
[(Object isKindOf: Apex) == true],

View File

@ -56,7 +56,7 @@ sg removeSemaphore: s1.
{
| tc limit |
tc := %(
tc := ##(
// 0 - 4
[self test_terminate == 180],
[self test_sg == nil]

View File

@ -42,8 +42,8 @@ class MyObject(Object)
ffi := FFI new: 'libc.so.6'.
now := ffi call: #time signature: 'l)i' arguments: #(0).
////ffi call: #srand signature: 'i)' arguments: %(now).
ffi call: #srandom signature: 'i)' arguments: %(now).
////ffi call: #srand signature: 'i)' arguments: ##(now).
ffi call: #srandom signature: 'i)' arguments: ##(now).
[
divr_ubound := 16rFFFFFFFFFFFFFFFFFFFFFFFF.