Skip to content

Commit

Permalink
merge back in some changes from Pharo 7
Browse files Browse the repository at this point in the history
OrderedDictionary>>#stonOn: change in #jsonMode: (feature)

Move away from Traits, more specifically

- Class>>#stonOn:
- ClassDescription>>#stonContainsSubObjects
- Metaclass>>#stonName
- Metaclass>>#stonOn:

instead of

- TClass>>#stonOn:
- TClassDescription>>#stonContainsSubObjects
- TApplyingOnClassSide>>#stonName
- TApplyingOnClassSide>>#stonOn:

use #instanceSide instead of #theNonMetaClass in MetaClass>>#stonOn:
  • Loading branch information
Sven Van Caekenberghe committed Oct 8, 2018
1 parent 71a8dd5 commit 2d0ab3a
Show file tree
Hide file tree
Showing 64 changed files with 279 additions and 281 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 8/15/2015 17:12"
"stonOn:" : ""
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 1/14/2012 15:53",
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:24"
"stonOn:" : "",
"stonContainSubObjects" : ""
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 2/12/2012 20:02",
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:25"
"stonOn:" : "",
"stonContainSubObjects" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 15:16"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 2/12/2012 20:02"
"stonOn:" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 15:17"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"instance" : { },
"instance" : {
"stonOn:" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 12/24/2015 20:58"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"instance" : {
"stonContainSubObjects" : ""
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name" : "ClassDescription"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 4/29/2012 12:23:33"
"stonOn:" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 13:54"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 11/19/2016 22:54",
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:26"
"stonOn:" : "",
"stonContainSubObjects" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 15:17"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 11/19/2016 22:57",
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:25"
"stonOn:" : "",
"stonContainSubObjects" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 5/28/2015 14:14"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"instance" : {
"stonPostReferenceResolution" : "SvenVanCaekenberghe 4/14/2016 13:55",
"stonOn:" : "SvenVanCaekenberghe 2/12/2012 14:58"
"stonPostReferenceResolution" : "",
"stonOn:" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 14:59"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 1/14/2012 15:47"
"stonOn:" : ""
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"instance" : {
"fromSton:" : "SvenVanCaekenberghe 2/24/2016 13:56",
"stonOn:" : "SvenVanCaekenberghe 2/24/2016 13:56"
"fromSton:" : "",
"stonOn:" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/24/2016 13:57"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
stonOn: stonWriter
stonWriter
writeObject: self
listSingleton: self theNonMetaClass name asSymbol
listSingleton: self instanceSide name asSymbol
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"instance" : { },
"instance" : {
"stonName" : "",
"stonOn:" : "SvenVanCaekenberghe 10/8/2018 15:09"
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 12/24/2015 20:59"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 1/14/2012 17:26",
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:26"
"stonOn:" : "",
"stonContainSubObjects" : ""
},
"class" : { }
}
20 changes: 10 additions & 10 deletions repository/STON-Core.package/Object.extension/methodProperties.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"instance" : {
"stonContainSubObjects" : "SvenVanCaekenberghe 11/29/2012 16:24",
"stonPostReferenceResolution" : "SvenVanCaekenberghe 4/14/2016 13:45",
"isStonReference" : "SvenVanCaekenberghe 1/18/2012 20:16",
"stonProcessSubObjects:" : "SvenVanCaekenberghe 11/29/2012 16:22",
"fromSton:" : "SvenVanCaekenberghe 5/28/2015 15:32",
"stonShouldWriteNilInstVars" : "SvenVanCaekenberghe 11/13/2013 23:43",
"stonOn:" : "SvenVanCaekenberghe 5/28/2015 15:06"
"stonContainSubObjects" : "",
"stonPostReferenceResolution" : "",
"isStonReference" : "",
"stonProcessSubObjects:" : "",
"fromSton:" : "",
"stonShouldWriteNilInstVars" : "",
"stonOn:" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 19:58",
"stonName" : "SvenVanCaekenberghe 8/12/2014 13:28",
"stonAllInstVarNames" : "SvenVanCaekenberghe 11/27/2014 11:08"
"fromSton:" : "",
"stonName" : "",
"stonAllInstVarNames" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
*ston-core
stonOn: stonWriter
"I store my instances as maps"
"I store my instances as maps. When in JSON mode,
encode me directly, without a class tag, keeping the order."

stonWriter
writeObject: self
do: [ stonWriter encodeMap: self ]
stonWriter jsonMode
ifTrue: [
stonWriter encodeMap: self ]
ifFalse: [
stonWriter
writeObject: self
do: [ stonWriter encodeMap: self ] ]
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 4/10/2015 15:28"
"stonOn:" : "SvenVanCaekenberghe 7/17/2017 15:05"
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 4/10/2015 15:29"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"instance" : {
"stonOn:" : "SvenVanCaekenberghe 5/7/2016 19:23"
"stonOn:" : ""
},
"class" : {
"fromSton:" : "SvenVanCaekenberghe 5/7/2016 19:24"
"fromSton:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"instance" : {
"fromSton:" : "SvenVanCaekenberghe 2/12/2012 14:30",
"stonOn:" : "SvenVanCaekenberghe 1/24/2012 10:02"
"fromSton:" : "",
"stonOn:" : ""
},
"class" : { }
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"instance" : { },
"class" : {
"fromSton:" : "SvenVanCaekenberghe 3/23/2014 18:51"
"fromSton:" : ""
}
}
38 changes: 19 additions & 19 deletions repository/STON-Core.package/STON.class/methodProperties.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"instance" : { },
"class" : {
"fromStringWithComments:" : "SvenVanCaekenberghe 6/9/2015 10:03",
"toStringPretty:" : "SvenVanCaekenberghe 2/12/2012 19:30",
"reader" : "SvenVanCaekenberghe 1/24/2012 09:37",
"put:onStream:" : "SvenVanCaekenberghe 1/24/2012 09:49",
"jsonWriter" : "SvenVanCaekenberghe 3/15/2016 14:40",
"classNameKey" : "SvenVanCaekenberghe 8/12/2014 15:04",
"associationClass" : "SvenVanCaekenberghe 8/15/2015 17:11",
"put:onStreamPretty:" : "SvenVanCaekenberghe 2/12/2012 19:30",
"fromStream:" : "SvenVanCaekenberghe 1/24/2012 09:39",
"put:asJsonOnStream:" : "SvenVanCaekenberghe 5/30/2012 22:06",
"put:asJsonOnStreamPretty:" : "SvenVanCaekenberghe 5/30/2012 22:07",
"fromString:" : "SvenVanCaekenberghe 1/24/2012 09:40",
"mapClass" : "SvenVanCaekenberghe 1/24/2012 09:36",
"fromStreamWithComments:" : "SvenVanCaekenberghe 6/9/2015 10:03",
"listClass" : "SvenVanCaekenberghe 1/24/2012 09:36",
"toJsonString:" : "SvenVanCaekenberghe 5/30/2012 22:07",
"toString:" : "SvenVanCaekenberghe 1/24/2012 09:49",
"writer" : "SvenVanCaekenberghe 1/24/2012 09:37",
"toJsonStringPretty:" : "SvenVanCaekenberghe 5/30/2012 22:07"
"fromStringWithComments:" : "",
"toStringPretty:" : "",
"reader" : "",
"put:onStream:" : "",
"jsonWriter" : "",
"classNameKey" : "",
"associationClass" : "",
"put:onStreamPretty:" : "",
"fromStream:" : "",
"put:asJsonOnStream:" : "",
"put:asJsonOnStreamPretty:" : "",
"fromString:" : "",
"mapClass" : "",
"fromStreamWithComments:" : "",
"listClass" : "",
"toJsonString:" : "",
"toString:" : "",
"writer" : "",
"toJsonStringPretty:" : ""
}
}
2 changes: 1 addition & 1 deletion repository/STON-Core.package/STON.class/properties.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"commentStamp" : "SvenVanCaekenberghe 3/15/2016 14:23",
"commentStamp" : "",
"super" : "Object",
"category" : "STON-Core",
"classinstvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"instance" : {
"nextNonCommentChar" : "SvenVanCaekenberghe 7/17/2015 15:32",
"close" : "SvenVanCaekenberghe 6/8/2015 22:58",
"handleStringDelimiter:" : "SvenVanCaekenberghe 7/17/2015 15:31",
"next:" : "SvenVanCaekenberghe 6/8/2015 22:56",
"insideString" : "SvenVanCaekenberghe 7/17/2015 14:21",
"next" : "SvenVanCaekenberghe 6/8/2015 23:06",
"peekFor:" : "SvenVanCaekenberghe 6/8/2015 22:56",
"consumeToCommentEnd" : "SvenVanCaekenberghe 6/8/2015 23:21",
"skip:" : "SvenVanCaekenberghe 6/8/2015 22:56",
"position" : "SvenVanCaekenberghe 6/9/2015 10:01",
"consumeComment" : "SvenVanCaekenberghe 7/17/2015 15:30",
"nextLine" : "SvenVanCaekenberghe 6/8/2015 22:56",
"wrappedStream" : "SvenVanCaekenberghe 6/8/2015 22:56",
"consumeToEOL" : "SvenVanCaekenberghe 6/8/2015 23:11",
"isBinary" : "SvenVanCaekenberghe 6/8/2015 22:58",
"readInto:startingAt:count:" : "SvenVanCaekenberghe 6/8/2015 22:56",
"upToEnd" : "SvenVanCaekenberghe 6/8/2015 22:56",
"upTo:" : "SvenVanCaekenberghe 6/8/2015 22:56",
"next:into:startingAt:" : "SvenVanCaekenberghe 6/8/2015 22:56",
"escape" : "SvenVanCaekenberghe 7/17/2015 14:21",
"atEnd" : "SvenVanCaekenberghe 6/8/2015 23:24",
"next:into:" : "SvenVanCaekenberghe 6/8/2015 22:56",
"on:" : "SvenVanCaekenberghe 6/8/2015 22:58",
"peek" : "SvenVanCaekenberghe 6/8/2015 23:06",
"collectionSpecies" : "SvenVanCaekenberghe 6/8/2015 22:55"
"nextNonCommentChar" : "",
"close" : "",
"handleStringDelimiter:" : "",
"next:" : "",
"insideString" : "",
"next" : "",
"peekFor:" : "",
"consumeToCommentEnd" : "",
"skip:" : "",
"position" : "",
"consumeComment" : "",
"nextLine" : "",
"wrappedStream" : "",
"consumeToEOL" : "",
"isBinary" : "",
"readInto:startingAt:count:" : "",
"upToEnd" : "",
"upTo:" : "",
"next:into:startingAt:" : "",
"escape" : "",
"atEnd" : "",
"next:into:" : "",
"on:" : "",
"peek" : "",
"collectionSpecies" : ""
},
"class" : {
"on:" : "SvenVanCaekenberghe 6/8/2015 22:58"
"on:" : ""
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"commentStamp" : "SvenVanCaekenberghe 7/17/2015 13:50",
"commentStamp" : "",
"super" : "Object",
"category" : "STON-Core",
"classinstvars" : [ ],
Expand Down
Loading

0 comments on commit 2d0ab3a

Please sign in to comment.