Adapt nyan to new specification #84

heinezen · 2020-10-05T14:42:45Z

Introduces the features discussed for version 1 of the nyan spec.

Version number (Use nyan file version number for parsing #40)
dict data type (Dict and dict operations #68)
children type modifier (children(type) to allow children only #65)
optional type modifier (optional-type #60)
abstract type modifier (Install import library with DLL on Windows #62)
int operations with floats (Allow operations with float values for int data type #83)
inf/-inf for int and float types
Change bool value keywords to pythonic spelling

First character is now uppercase.

Allows for more complex items, e.g. for dicts.

TheJJ

very nice!
the only (major) thing i'm not happy about is the none-value assignment validation.
we should do it properly, even if it means some restructuring.

the validation if none can be assigned should be done by recursively checking from the inside of a type until we reach the type root, and there we just validate the allowed ops of this composite type with the given value.
if there's no ops, then we step up one step of the composite type and validate if there's any allowed ops in the next type. if there's no allowed ops when we reach the type root, the assignment is not allowed.

TheJJ · 2021-01-10T16:26:32Z

nyan/value/number.cpp

+			throw Error{"dividing two inf values not permitted"};
+
+		default:
+			throw Error{"unknown operation requested"};


these should be "runtime errors"

InternalError or a new error class?

TheJJ · 2021-01-10T16:40:43Z

nyan/value/number.cpp

+			return 0;
+
+		default:
+			throw Error{"unknown operation requested"};


All these should not be Error, but something else that indicates this is a user-value-induced-problem, and it's a runtime error, and maybe that it's specifically invalid infinity handling

We could apply the same restrctions to inf as we did for None: None can only be assigned (=). But even then we counter encounter the inf * 0 case at runtime (assuming that x / 0 is handled for all numbers).

TheJJ · 2021-01-10T16:48:42Z

nyan/value/number.cpp

-			Float *left = dynamic_cast<Float *>(this);
-			auto change_value = left->handle_infinity(change, operation);
+			Float left = static_cast<Float>(*this);
+			auto change_value = left.handle_infinity(change, operation);


didn't it work with pointers? or is this just an optimization?

If I do

Float *left = static_cast<Float *>(this);

it complains about

error: invalid ‘static_cast’ from type ‘nyan::Number<long int>*’ to type ‘nyan::Float*’ {aka ‘nyan::Number<double>*’} [build] 147 | Float *left = static_cast<Float *>(this);

Oh, I didn't see that the typecheck above is about operand, not about this.

So the error makes sense since *this can be Float, Int or any other template instance of Number. If we statically cast this to Float* in case this is actually Int*, it would mean we do an invalid side-cast. When we don't have ptrs/refs (like you have now), it actually calls the implicit conversion from *this to Float (i.e. Number(T value) and the to-float/to-int conversion from operator T()).

So we do get a new Float object that is created from the int-object, since it basically calls this: Float left{this->get()}; But this doesn't handle the cases when the values are infinite. We would need explicit conversions from Float to Int and vice versa, where we take over the inf values.

But what happens when change_value (which will be of Float here) is inf, and we now apply it to this->value? It's also not handled, we need to back-convert the float-inf to a int-inf. So i suspect we need a better general approach instead of converting back and forward.

(done in #87 )

nyan/value/dict.cpp

TheJJ · 2021-01-10T17:33:58Z

nyan/value/dict.cpp

+	builder << util::strjoin(
+		", ", this->values,
+		[] (const auto &val) {
+			return val.first->str() + ": " + val.second->str();


the python standard is to always use repr for the dict members. so Dict::str and Dict::repr can be identicall, and use the repr variant.

so just use return this->repr(); in this function?

Yea, i'd say so.

TheJJ · 2021-01-10T23:59:00Z

nyan/value/object.cpp

-	if (with_type.get_primitive_type() == primitive_t::OBJECT) {
+	switch (with_type.get_primitive_type()) {
+	case primitive_t::OBJECT:
+	case primitive_t::NONE:
 		return ops;


why can we assign = None to an object?

#84 (comment)

TheJJ · 2021-01-10T23:59:36Z

nyan/value/orderedset.cpp

@@ -88,6 +88,13 @@ const std::unordered_set<nyan_op> &OrderedSet::allowed_operations(const Type &wi
 		nyan_op::INTERSECT_ASSIGN,
 	};

+	if (with_type.get_primitive_type() == primitive_t::NONE) {
+		return none_ops;


why can we assign = None to an orderedset?

#84 (comment)

TheJJ · 2021-01-10T23:59:56Z

nyan/value/set.cpp

@@ -90,6 +90,14 @@ const std::unordered_set<nyan_op> &Set::allowed_operations(const Type &with_type
 		nyan_op::INTERSECT_ASSIGN,
 	};

+	if (with_type.get_primitive_type() == primitive_t::NONE) {
+		return none_ops;


why can we assign = None to a set?

#84 (comment)

TheJJ · 2021-01-11T00:00:10Z

nyan/value/text.cpp

-	else {
+
+	case primitive_t::NONE:
+		return none_ops;


why can we assign = None to a text?

#84 (comment)

TheJJ · 2021-01-11T00:07:35Z

nyan/value/value.cpp

+
+		if (modifier_type == composite_t::OPTIONAL) {
+			contains_optional = true;
+		}


interesting corner case, which optional do we assign to in optional(optional(int)) = None (it won't matter in practice since the returnvalue is None in either way). or optional(bool) = None where it will matter in practice.

It is just assigned to the member because optional does not have its own Value instance. In the current implementation optional(optional(int)) is treated the same as optional(int).

ok that resolves that, but what about optional(bool) = None? we have do decide on a behavior there, i'd say we try to assign it from the inside to the outside until the operator = is accepted. then we also don't need all the none-assignments in all the types

Also removes old parser code that was commented out.

TheJJ · 2021-02-16T19:33:46Z

I'll continue this in #87

heinezen force-pushed the dict branch from 84c3198 to d8a88f9 Compare October 5, 2020 15:20

lexer: Add '!' (bang) as symbol.

ef6cf3b

heinezen force-pushed the dict branch from d8a88f9 to ef6cf3b Compare October 5, 2020 15:22

lexer: Enforce 'version' as first argument in file.

ec687e0

heinezen changed the title ~~Adapt nyan to new specification~~ [WIP] Adapt nyan to new specification Oct 6, 2020

heinezen added 2 commits October 12, 2020 02:43

lexer: Fix dates and include dict type.

e017655

parser: Read arbitrary member type arguments.

05f74f6

heinezen force-pushed the dict branch from 38b42fe to 05f74f6 Compare October 16, 2020 16:44

nyan: Allow floats for int operations.

1083219

heinezen force-pushed the dict branch from 5df4e4e to 1083219 Compare October 17, 2020 17:36

heinezen added 4 commits October 17, 2020 21:18

nyan: Define values for float/int positive and negative infinty.

d075d25

nyan: Calculus rules for infinity.

c9a9daa

lexer: Parse inf/-inf tokens.

d2a9005

nyan: Fix handling infinity pointer.

e29f7d4

heinezen force-pushed the dict branch from 769e80f to e29f7d4 Compare October 19, 2020 07:52

heinezen added 5 commits October 19, 2020 23:06

nyan: Change bool's True/False to pythonic notation.

8e902ec

First character is now uppercase.

nyan: ValueToken for more complex values.

0b873cf

nyan: Use ValueToken while creating AST and Value instances.

096317c

parser: Parse dict items.

c1b62b5

nyan: Dict data type.

32df34b

heinezen force-pushed the dict branch from fcff6b1 to 32df34b Compare November 21, 2020 03:46

heinezen added 3 commits November 22, 2020 15:28

nyan: Make 'element_type' of Type a vector.

6b19fab

Allows for more complex items, e.g. for dicts.

dict: Create dicts from nyan file.

6902201

dict: Intersection operation.

4b005dd

heinezen added 15 commits December 20, 2020 04:35

refactor: Add comments to parser.h.

492d730

refactor: Add comments to patch_info.h.

c6e080a

refactor: Add comments to state_history.h.

0f79321

refactor: Add comments to state.h.

9122237

refactor: Add comments to token_stream.h.

543478d

refactor: Add comments to token.h.

8ba7e7a

refactor: Add comments to transaction.h.

549855c

refactor: Add comments to type.h.

ba2cdfc

refactor: Add comments to util.h.

7d5dfaa

refactor: Add comments to value_token.h.

22b1725

refactor: Add comments to value.h.

8fd9b9e

refactor: Add comments to value_holder.h.

ccae9c0

refactor: Convert tabs to spaces in files.

bb3dfd4

fix copyright dates.

1a092e3

nyan: Assign None directly on Member::apply().

90097df

heinezen changed the title ~~[WIP] Adapt nyan to new specification~~ Adapt nyan to new specification Dec 23, 2020

heinezen mentioned this pull request Jan 8, 2021

[WIP] Core gamestate implementation SFTtech/openage#1066

Closed

13 tasks

TheJJ requested changes Jan 11, 2021

View reviewed changes

heinezen added 7 commits January 15, 2021 11:42

parser: Use switch statement for differentiating composite types.

3cb82d7

Also removes old parser code that was commented out.

dict: Comment fixes.

590c268

ast: Use size_t for comma list boundary.

2831c7e

nyan: Cody styling for is_none() function.

a83907e

nyan: Remove unused parameters from lambda functions.

8e537c9

nyan: Better description for None.

b8952bf

parser: Replace ifs in handle_modifiers() with switch statement.

72f5e03

heinezen requested a review from TheJJ January 15, 2021 12:17

TheJJ self-assigned this Jan 21, 2021

TheJJ mentioned this pull request Feb 16, 2021

Dict abstract optional inf children #87

Merged

9 tasks

TheJJ closed this Feb 16, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adapt nyan to new specification #84

Adapt nyan to new specification #84

heinezen commented Oct 5, 2020 •

edited

Loading

TheJJ left a comment

TheJJ Jan 10, 2021

heinezen Jan 15, 2021

TheJJ Jan 10, 2021

heinezen Jan 15, 2021

TheJJ Jan 10, 2021

heinezen Jan 15, 2021 •

edited

Loading

TheJJ Jan 15, 2021

TheJJ May 29, 2021

TheJJ Jan 10, 2021

heinezen Jan 15, 2021

TheJJ Jan 15, 2021

TheJJ Jan 10, 2021

heinezen Jan 15, 2021

TheJJ Jan 10, 2021

heinezen Jan 15, 2021

TheJJ Jan 10, 2021

heinezen Jan 15, 2021

TheJJ Jan 11, 2021

heinezen Jan 15, 2021

TheJJ Jan 11, 2021 •

edited

Loading

heinezen Jan 15, 2021

TheJJ Jan 15, 2021

TheJJ commented Feb 16, 2021

Adapt nyan to new specification #84

Adapt nyan to new specification #84

Conversation

heinezen commented Oct 5, 2020 • edited Loading

TheJJ left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

heinezen Jan 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheJJ Jan 11, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheJJ commented Feb 16, 2021

heinezen commented Oct 5, 2020 •

edited

Loading

heinezen Jan 15, 2021 •

edited

Loading

TheJJ Jan 11, 2021 •

edited

Loading