Merge pull request #17 from sorabito/develop

Develop
sorabito · Apr 17, 2019 · 3a93626 · 3a93626
2 parents bc6171a + 51e1990
commit 3a93626
Show file tree

Hide file tree

Showing 21 changed files with 80 additions and 8 deletions.
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlIdentifier.class/instance/prop..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlIdentifier.class/instance/prop..st
@@ -1,4 +1,3 @@
 accessing
 prop: propName
-	self accessor ifNil: [ self accessor: (MixpanelJqlIdentifier of: propName) ]
-		ifNotNil: [ self accessor prop: propName ]
+	self accessor: propName
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlIdentifier.class/methodProperties.json b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlIdentifier.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"accessor" : "KazunoriUeda 4/4/2019 09:56",
 		"asMixpanelJqlIdentifierString" : "KazunoriUeda 4/16/2019 17:31",
 		"tokensAccessorOn:" : "KazunoriUeda 4/16/2019 17:27",
-		"prop:" : "KazunoriUeda 4/16/2019 17:25",
+		"prop:" : "KazunoriUeda 4/17/2019 11:57",
 		"identifier:" : "KazunoriUeda 4/16/2019 17:23",
 		"accessor:" : "KazunoriUeda 4/4/2019 09:56",
 		"tokensOn:" : "KazunoriUeda 4/16/2019 17:31"

diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/class/of.prop..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/class/of.prop..st
@@ -0,0 +1,3 @@
+instance creation
+of: identifier prop: prop
+	^ self new identifier: identifier; prop: 'properties'; prop: prop
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^less.equals.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^less.equals.st
@@ -0,0 +1,3 @@
+adding
+<= anObject
+	self operator: '<=' operand: anObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^less.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^less.st
@@ -0,0 +1,3 @@
+adding
+< anObject
+	self operator: '<' operand: anObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^more.equals.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^more.equals.st
@@ -0,0 +1,3 @@
+adding
+>= anObject
+	self operator: '>=' operand: anObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^more.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/^more.st
@@ -0,0 +1,3 @@
+adding
+> anObject
+	self operator: '>' operand: anObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/equals..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/equals..st
@@ -0,0 +1,3 @@
+adding
+equals: anObject
+	self operator: '==' operand: anObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/isFalse.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/isFalse.st
@@ -0,0 +1,3 @@
+adding
+isFalse
+	self equals: (MixpanelJqlIdentifier of: 'false')
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/isTrue.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/isTrue.st
@@ -0,0 +1,3 @@
+adding
+isTrue
+	self equals: (MixpanelJqlIdentifier of: 'true')
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/notEquals..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/notEquals..st
@@ -0,0 +1,3 @@
+adding
+notEquals: anObject
+	self operator: '!=' operand: anObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operand..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operand..st
@@ -0,0 +1,3 @@
+accessing
+operand: anObject
+	operand := anObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operand.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operand.st
@@ -0,0 +1,3 @@
+accessing
+operand
+	^ operand
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operator..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operator..st
@@ -0,0 +1,3 @@
+accessing
+operator: anObject
+	operator := anObject
diff --git a/...repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operator.operand..st b/...repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operator.operand..st
@@ -0,0 +1,3 @@
+adding
+operator: aString operand: anObject
+	self operator: aString; operand: (anObject asMixpanelJqlKey) asMixpanelJqlObject
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operator.st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/operator.st
@@ -0,0 +1,3 @@
+accessing
+operator
+	^ operator
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/prop..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/prop..st
@@ -0,0 +1,4 @@
+accessing
+prop: propName
+	self accessor ifNil: [ self accessor: (MixpanelJqlProperties identifier: propName) ]
+		ifNotNil: [ self accessor prop: propName ]
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/tokensOn..st b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/instance/tokensOn..st
@@ -0,0 +1,7 @@
+printing
+tokensOn: tokens
+	super tokensOn: tokens.
+	((self operator notNil) and: [ self operand notNil ]) ifTrue: [
+		tokens spacedAdd: self operator.
+		self operand tokensOn: tokens.
+	]
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/methodProperties.json b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/methodProperties.json
@@ -1,7 +1,24 @@
 {
-	"instance" : { },
+	"instance" : {
+		">" : "KazunoriUeda 4/17/2019 12:21",
+		">=" : "KazunoriUeda 4/17/2019 12:21",
+		"operator:" : "KazunoriUeda 4/17/2019 12:01",
+		"equals:" : "KazunoriUeda 4/17/2019 12:23",
+		"isTrue" : "KazunoriUeda 4/17/2019 12:25",
+		"isFalse" : "KazunoriUeda 4/17/2019 12:26",
+		"prop:" : "KazunoriUeda 4/17/2019 11:56",
+		"notEquals:" : "KazunoriUeda 4/17/2019 12:28",
+		"operator:operand:" : "KazunoriUeda 4/17/2019 12:18",
+		"operator" : "KazunoriUeda 4/17/2019 12:01",
+		"operand:" : "KazunoriUeda 4/17/2019 12:01",
+		"<" : "KazunoriUeda 4/17/2019 12:21",
+		"<=" : "KazunoriUeda 4/17/2019 12:21",
+		"operand" : "KazunoriUeda 4/17/2019 12:01",
+		"tokensOn:" : "KazunoriUeda 4/17/2019 12:13"
+	},
 	"class" : {
 		"of:" : "KazunoriUeda 4/16/2019 12:39",
-		"prop:" : "KazunoriUeda 4/16/2019 12:41"
+		"prop:" : "KazunoriUeda 4/16/2019 12:41",
+		"of:prop:" : "KazunoriUeda 4/17/2019 11:51"
 	}
 }
diff --git a/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/properties.json b/pharo-repository/Mixpanel-Jql.package/MixpanelJqlProperties.class/properties.json
@@ -5,7 +5,10 @@
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
-	"instvars" : [ ],
+	"instvars" : [
+		"operator",
+		"operand"
+	],
 	"name" : "MixpanelJqlProperties",
 	"type" : "normal"
 }
diff --git a/pharo-repository/Mixpanel-Jql.package/monticello.meta/version b/pharo-repository/Mixpanel-Jql.package/monticello.meta/version
@@ -1,3 +1,3 @@
-(name 'Mixpanel-Jql-KazunoriUeda.1555393623' message 'empty log message' id '46bf235c-0343-0d00-b4ef-6a270f8f733e' date '16 April 2019' time '5:33:27.048407 pm' author 'KazunoriUeda' ancestors ((name 'Mixpanel-Jql-KazunoriUeda.1555393622' message 'empty log message' id 'bf3a655b-0343-0d00-b4ed-c25d0f8f733e' date '16 April 2019' time '5:33:14.562501 pm' author 'KazunoriUeda' ancestors ((name 'Mixpanel-Jql-GitHub.1555393621' message 'Merge pull request #13 from sorabito/develop
+(name 'Mixpanel-Jql-KazunoriUeda.1555403890' message 'empty log message' id 'f8ee5a3d-1343-0d00-9b37-18b905d5407a' date '17 April 2019' time '12:30:10.047845 pm' author 'KazunoriUeda' ancestors ((name 'Mixpanel-Jql-GitHub.1555403889' message 'Merge pull request #15 from sorabito/develop
 
-ãã¡ã¤ã«ã®åé¤æ¼ãã' id 'a0c2a8c6-61c3-5b6c-92a4-1ad59e65b026' date '16 April 2019' time '5:47:01 am' author 'GitHub' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
+Develop' id '1fc1a5c2-0350-5855-b379-a56902c6d77c' date '16 April 2019' time '8:38:09 am' author 'GitHub' ancestors () stepChildren ())) stepChildren ())