Merge jv
authorMerge Script
Mon, 08 Jun 2015 06:58:54 +0200
branchjv
changeset 18461 bc3d3101c493
parent 18457 214d760f8247 (current diff)
parent 18460 8c545d355fd2 (diff)
child 18472 41c8c83b318e
Merge
ClassDescription.st
InlineObject.st
InlineObjectClassDescription.st
--- a/ClassDescription.st	Sun Jun 07 06:38:49 2015 +0200
+++ b/ClassDescription.st	Mon Jun 08 06:58:54 2015 +0200
@@ -1164,6 +1164,10 @@
 
     "Modified: 12.6.1996 / 11:49:08 / stefan"
     "Created: 3.6.1997 / 11:55:05 / cg"
+!
+
+sharedPoolNames
+    ^ #()
 ! !
 
 !ClassDescription methodsFor:'adding & removing'!
@@ -3321,6 +3325,10 @@
     "Modified (comment): / 31-01-2012 / 13:57:23 / cg"
 !
 
+privateClasses
+    ^ #()
+!
+
 sourceCodeForMethod:aMethod at:aSelector
     ^ aMethod source
 
@@ -4327,11 +4335,11 @@
 !ClassDescription class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.263 2015-04-10 14:07:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.264 2015-06-08 00:22:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.263 2015-04-10 14:07:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.264 2015-06-08 00:22:59 cg Exp $'
 ! !
 
 
--- a/InlineObject.st	Sun Jun 07 06:38:49 2015 +0200
+++ b/InlineObject.st	Mon Jun 08 06:58:54 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2009 by eXept Software AG
               All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#InlineObject
 	instanceVariableNames:''
 	classVariableNames:''
@@ -38,7 +42,6 @@
 "
     WARNING: InlineObjects are an experimental feature.
 
-    All inlineObjects will be instances of an anonymous subclass of me.
     InlineObjects are written as literals of the form:
 
     #{ 
@@ -56,6 +59,9 @@
         age: 25.
     }
         
+    All inlineObjects will be instances of an anonymous subclass of me,
+    and provide getter protocol for their fields (eg. firstName, lastName and age in the above example.
+    InlineObjects are immutable (no setters).
 "
 ! !
 
@@ -74,5 +80,6 @@
 !InlineObject class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/InlineObject.st,v 1.3 2009-09-11 13:05:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/InlineObject.st,v 1.4 2015-06-08 00:24:48 cg Exp $'
 ! !
+
--- a/InlineObjectClassDescription.st	Sun Jun 07 06:38:49 2015 +0200
+++ b/InlineObjectClassDescription.st	Mon Jun 08 06:58:54 2015 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 ClassDescription subclass:#InlineObjectClassDescription
 	instanceVariableNames:''
 	classVariableNames:''
@@ -53,10 +55,10 @@
 !InlineObjectClassDescription class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/InlineObjectClassDescription.st,v 1.3 2014-05-13 22:49:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/InlineObjectClassDescription.st,v 1.4 2015-06-08 00:24:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/InlineObjectClassDescription.st,v 1.3 2014-05-13 22:49:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/InlineObjectClassDescription.st,v 1.4 2015-06-08 00:24:56 cg Exp $'
 ! !