Skip to content

Commit 6474d06

Browse files
mumezmumez
committed
Salvaged some wrongly merged commits
1 parent 04ecd09 commit 6474d06

File tree

16 files changed

+47
-13
lines changed

16 files changed

+47
-13
lines changed

‎repository/MessagePack-Core.package/Behavior.extension/methodProperties.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
"class" : {
33
},
44
"instance" : {
5-
"fromMessagePack:" : "mu 5/1/2011 21:27" } }
5+
"fromMessagePack:" : "mu 5/1/2011 21:27",
6+
"fromMessagePack:setting:" : "MasashiUmezawa 2/1/2013 23:14" } }

‎repository/MessagePack-Core.package/IdentityDictionary.extension/methodProperties.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
"class" : {
33
},
44
"instance" : {
5+
"asMpMap" : "MasashiUmezawa 2/2/2013 00:25",
56
"mpWriteSelector" : "mu 10/10/2011 16:31" } }

‎repository/MessagePack-Core.package/MpDecodeTypeMapper.class/methodProperties.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"defineUnsignedIntegerActionTo:" : "mu 4/30/2011 22:46",
1515
"on:" : "mu 11/20/2011 16:50" },
1616
"instance" : {
17+
"bytesAsString" : "MasashiUmezawa 2/2/2013 01:09",
1718
"decoder" : "mu 4/29/2011 23:40",
1819
"decoder:" : "mu 4/29/2011 23:40",
20+
"isBytesAsString" : "MasashiUmezawa 2/2/2013 01:09",
21+
"isBytesAsString:" : "MasashiUmezawa 2/2/2013 01:08",
1922
"readObjectOf:ifNotApplied:" : "mu 4/30/2011 22:58" } }

‎repository/MessagePack-Core.package/MpDecodeTypeMapper.class/properties.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
],
77
"commentStamp" : "",
88
"instvars" : [
9-
"decoder" ],
9+
"decoder",
10+
"isBytesAsString" ],
1011
"name" : "MpDecodeTypeMapper",
1112
"pools" : [
1213
],

‎repository/MessagePack-Core.package/MpDecoder.class/instance/readFixRaw..st‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
reading
22
readFixRaw: firstByte
33
| size |
4+
self typeMapper isBytesAsString ifTrue: [^self readFixString: firstByte].
45
size := (firstByte bitAnd: 2r11111).
56
^self readStream next: size

‎repository/MessagePack-Core.package/MpDecoder.class/instance/typeMapper.st‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
accessing
22
typeMapper
3-
^ typeMapper ifNil: [typeMapper := self typeMapperClass on: self].
3+
^ typeMapper
4+
ifNil: [typeMapper := self typeMapperClass on: self.
5+
self settings bytesAsString ifTrue: [typeMapper bytesAsString].
6+
typeMapper]

‎repository/MessagePack-Core.package/MpDecoder.class/methodProperties.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"class" : {
33
"decode:" : "mu 4/29/2011 23:40",
4+
"decode:setting:" : "MasashiUmezawa 2/1/2013 23:14",
45
"decodeFrom:" : "mu 4/29/2011 23:40",
6+
"decodeFrom:setting:" : "MasashiUmezawa 2/1/2013 23:14",
57
"on:" : "mu 5/15/2011 00:40",
68
"onBytes:" : "mu 4/29/2011 23:40" },
79
"instance" : {
@@ -11,7 +13,9 @@
1113
"createOrderedCollection:" : "mu 4/29/2011 23:40",
1214
"decode" : "mu 5/2/2011 14:15",
1315
"decode:" : "mu 4/29/2011 23:40",
16+
"decode:setting:" : "MasashiUmezawa 2/1/2013 23:13",
1417
"decodeFrom:" : "mu 4/29/2011 23:40",
18+
"decodeFrom:setting:" : "MasashiUmezawa 2/1/2013 23:13",
1519
"next" : "mu 6/7/2011 17:54",
1620
"read" : "mu 4/30/2011 23:43",
1721
"readArray16" : "mu 4/30/2011 23:45",
@@ -21,7 +25,8 @@
2125
"readFalse" : "mu 4/30/2011 23:15",
2226
"readFixArray:" : "mu 6/7/2011 21:00",
2327
"readFixMap:" : "mu 6/7/2011 21:00",
24-
"readFixRaw:" : "mu 6/7/2011 21:00",
28+
"readFixRaw:" : "MasashiUmezawa 2/2/2013 01:10",
29+
"readFixString:" : "MasashiUmezawa 2/2/2013 00:55",
2530
"readFloat" : "mu 6/2/2011 12:24",
2631
"readInt16" : "mu 5/1/2011 16:06",
2732
"readInt32" : "mu 5/1/2011 16:06",
@@ -40,6 +45,8 @@
4045
"readRaw32" : "mu 5/1/2011 22:46",
4146
"readStream" : "mu 4/29/2011 23:40",
4247
"readStream:" : "mu 4/29/2011 23:40",
48+
"readString16" : "MasashiUmezawa 2/2/2013 01:02",
49+
"readString32" : "MasashiUmezawa 2/2/2013 01:02",
4350
"readTrue" : "mu 4/30/2011 23:16",
4451
"readType" : "mu 4/30/2011 23:33",
4552
"readUint16" : "mu 4/30/2011 23:31",
@@ -50,5 +57,5 @@
5057
"settingsClass" : "mu 6/2/2011 17:41",
5158
"signalError" : "mu 5/2/2011 14:15",
5259
"signalError:" : "mu 5/2/2011 14:15",
53-
"typeMapper" : "mu 4/29/2011 23:40",
60+
"typeMapper" : "MasashiUmezawa 2/2/2013 00:57",
5461
"typeMapperClass" : "mu 4/29/2011 23:42" } }

‎repository/MessagePack-Core.package/MpEncodeTypeMapper.class/instance/writeObject.ifNotApplied..st‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ writeObject: anObject ifNotApplied: aBlock
66
actionSelector ifNotNil: [^ self encoder perform: actionSelector with: anObject]].
77

88
actionSelector := anObject mpWriteSelector.
9-
actionSelector ifNil: [actionSelector := self defaultActionMap at: anObject class ifAbsent: [^ aBlock value]].
9+
actionSelector ifNil: [
10+
actionSelector := self defaultActionMap at: anObject class ifAbsent: [^ self encoder writeUnknown: anObject withHandler: aBlock ]
11+
].
1012
^ self encoder perform: actionSelector with: anObject

‎repository/MessagePack-Core.package/MpEncodeTypeMapper.class/methodProperties.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
"encoder" : "mu 4/29/2011 15:15",
1717
"encoder:" : "mu 4/29/2011 15:15",
1818
"stringAsBytes" : "mu 5/2/2012 12:19",
19-
"writeObject:ifNotApplied:" : "mu 10/10/2011 16:38" } }
19+
"writeObject:ifNotApplied:" : "MasashiUmezawa 2/1/2013 23:52" } }

‎repository/MessagePack-Core.package/MpEncoder.class/methodProperties.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
"class" : {
33
"encode:" : "mu 4/29/2011 15:07",
44
"encode:on:" : "mu 4/29/2011 15:07",
5+
"encode:on:setting:" : "MasashiUmezawa 2/1/2013 22:31",
6+
"encode:setting:" : "MasashiUmezawa 2/1/2013 22:33",
57
"on:" : "mu 4/29/2011 15:07",
68
"onBytes:" : "mu 4/29/2011 15:07" },
79
"instance" : {
810
"contents" : "mu 4/29/2011 15:07",
911
"createWriteStream" : "mu 10/29/2011 23:25",
1012
"encode:" : "mu 4/29/2011 15:07",
1113
"encode:on:" : "mu 4/29/2011 15:07",
14+
"encode:on:setting:" : "MasashiUmezawa 2/1/2013 22:30",
15+
"encode:setting:" : "MasashiUmezawa 2/1/2013 22:34",
1216
"nextPut:" : "mu 6/7/2011 17:50",
1317
"nextPutAll:" : "mu 6/7/2011 17:56",
1418
"settings" : "mu 4/29/2011 15:07",
@@ -45,4 +49,5 @@
4549
"writeUint32:" : "mu 4/29/2011 15:39",
4650
"writeUint64:" : "mu 4/29/2011 15:49",
4751
"writeUint8:" : "mu 4/29/2011 15:38",
52+
"writeUnknown:withHandler:" : "MasashiUmezawa 2/2/2013 00:37",
4853
"writeWideString:" : "mu 5/2/2012 12:34" } }

0 commit comments

Comments
 (0)