Skip to content
This repository has been archived by the owner on Jul 5, 2023. It is now read-only.

Added support for Infinity and -Infinity #166

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Added support for Infinity and -Infinity #166

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9d5bb5
Added support for Infinity and -Infinity
richthegeek Mar 3, 2014
bb3b0d6
Code shortened for +-Infinity encoding
richthegeek Mar 3, 2014
751f5cb
Rebuild genghis core files
richthegeek Mar 3, 2014
909e4bb
PHP infinity, simple test case
richthegeek Mar 3, 2014
b724410
Infinite should be infinity for tests to pass.
richthegeek Mar 4, 2014
1c859fd
PHP typo
richthegeek Mar 4, 2014
3e181de
Actually fix the PHP code...
richthegeek Mar 4, 2014
61efbf8
Clarify the -Infinity check with UnaryExpression
richthegeek Mar 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/css/prettyprint.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
position: relative;
white-space: pre;

.null, .bool, .atom,
.null, .bool, .atom, .inf,
.z, .b, .a {
color: #0086b3;
}
Expand Down
12 changes: 10 additions & 2 deletions client/js/json.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,12 @@ GenghisJSON =
# Property value has to be an array, object, literal, or a whitelisted call
when 'Property'
if node.value
if node.value.type is 'Identifier' and node.value.name is 'NaN'
node.update("\"#{node.key.name}\": {\"$genghisType\": \"NaN\"}")
# -Infinity is seen as a UnaryExp, so handle it with a special case
if node.value.type is 'UnaryExpression' and node.value.argument.name is 'Infinity'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't actually know how esprima parse trees look for other unary expressions, but it seems like this line should be:

if node.value.type is 'UnaryExpression' and node.value.argument.type is 'Identifier' and node.value.argument.name is 'Infinity'

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah I guess the extra check on the argument type would be good practice.

node.update("\"#{node.key.name}\": {\"$genghisType\": \"-Infinity\"}")
# +Infinity and NaN are known identifiers, where the genghisType is the same as the identifier
else if node.value.type is 'Identifier' and node.value.name in ['NaN', 'Infinity']
node.update("\"#{node.key.name}\": {\"$genghisType\": \"#{node.value.name}\"}")
else
unless ALLOWED_PROPERTY_VALUES[node.value.type]
addError("Unexpected value: #{node.value.source()}", node.value)
Expand Down Expand Up @@ -336,6 +340,10 @@ GenghisJSON =
"<span class='call bindata'>BinData(#{$subtype}, #{$binary})</span>"
when 'NaN'
"<span class='v a'>NaN</span>"
when 'Infinity'
"<span class='v a inf'>Infinity</span>"
when '-Infinity'
"<span class='v a inf'>-Infinity</span>"
when 'Timestamp'
$t = printScalar(value.$value.$t)
$i = printScalar(value.$value.$i)
Expand Down
36 changes: 18 additions & 18 deletions genghis.php
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 21 additions & 19 deletions genghis.rb
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion server/rb/genghis/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def enc(o, *a)
when BSON::Timestamp then thunk('Timestamp', '$t' => o.seconds, '$i' => o.increment)
when BSON::MinKey then {'$genghisType' => 'MinKey'}
when BSON::MaxKey then {'$genghisType' => 'MaxKey'}
when Float then o.nan? ? {'$genghisType' => 'NaN'} : o
when Float then o.nan? ? {'$genghisType' => 'NaN'} : o.finite? ? o : {'$genghisType' => o.to_s}
else o
end
end
Expand Down Expand Up @@ -100,6 +100,8 @@ def dec(o)
when 'MinKey' then BSON::MinKey.new
when 'MaxKey' then BSON::MaxKey.new
when 'NaN' then Float::NAN
when 'Infinity' then Float::INFINITY
when '-Infinity' then 0 - Float::INFINITY
when 'NumberLong' then o['$value'].to_i
else fail Genghis::MalformedDocument
end
Expand Down