Index: libcfa/prelude/builtins.c =================================================================== --- libcfa/prelude/builtins.c (revision 61ce21419e1e9f10bc28013bf9650f22ac59775b) +++ libcfa/prelude/builtins.c (revision cf5af9c8d29577a706fa60398a64924729dc5c24) @@ -10,6 +10,6 @@ // Created On : Fri Jul 21 16:21:03 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Jul 12 10:40:57 2020 -// Update Count : 107 +// Last Modified On : Mon Jul 13 21:10:02 2020 +// Update Count : 109 // @@ -95,10 +95,10 @@ static inline forall( dtype DT ) DT * intptr( uintptr_t addr ) { return (DT *)addr; } -#if __SIZEOF_POINTER__ == 8 // 64-bit mode +#if defined(__SIZEOF_INT128__) // constructor for 128-bit numbers (all constants are unsigned as +/- are operators) static inline void ?{}( unsigned int128 & this, unsigned long int h, unsigned long int l ) { this = (unsigned int128)h << 64 | (unsigned int128)l; } // ?{} -#endif // 64-bit mode +#endif // __SIZEOF_INT128__ // exponentiation operator implementation Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision 61ce21419e1e9f10bc28013bf9650f22ac59775b) +++ src/Parser/ExpressionNode.cc (revision cf5af9c8d29577a706fa60398a64924729dc5c24) @@ -10,6 +10,6 @@ // Created On : Sat May 16 13:17:07 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Jul 12 11:55:44 2020 -// Update Count : 1040 +// Last Modified On : Mon Jul 13 21:12:02 2020 +// Update Count : 1043 // @@ -186,7 +186,7 @@ // Cannot be just "0"/"1"; sscanf stops at the suffix, if any; value goes over the wall => always generate -#if __SIZEOF_POINTER__ == 4 // 32-bit mode +#if ! defined(__SIZEOF_INT128__) if ( type == 5 ) SemanticError( yylloc, "int128 constant is not supported on this target " + str ); -#endif // 32-bit mode +#endif // ! __SIZEOF_INT128__ if ( str[0] == '0' ) { // radix character ? @@ -219,5 +219,5 @@ if ( type < 5 ) { // not L128 ? sscanf( (char *)str.c_str(), "%llo", &v ); -#if __SIZEOF_POINTER__ == 8 // 64-bit mode +#if defined(__SIZEOF_INT128__) } else { // octal int128 constant unsigned int len = str.length(); @@ -245,5 +245,5 @@ str = buf; } // if -#endif // 64-bit mode +#endif // __SIZEOF_INT128__ } // if //printf( "%#llo %llu\n", v, v ); @@ -252,5 +252,5 @@ if ( type < 5 ) { // not L128 ? sscanf( (char *)str.c_str(), "%llu", &v ); -#if __SIZEOF_POINTER__ == 8 // 64-bit mode +#if defined(__SIZEOF_INT128__) } else { // decimal int128 constant #define P10_UINT64 10'000'000'000'000'000'000ULL // 19 zeroes @@ -280,5 +280,5 @@ str = buf; } // if -#endif // 64-bit mode +#endif // __SIZEOF_INT128__ } // if //printf( "%llu\n", v ); Index: sts/errors/.expect/completeType.txt =================================================================== --- tests/errors/.expect/completeType.txt (revision 61ce21419e1e9f10bc28013bf9650f22ac59775b) +++ (revision ) @@ -1,141 +1,0 @@ -errors/completeType.cfa:34:1 error: Cannot choose between 2 alternatives for expression -Generated Cast of: - Applying untyped: - Name: *? - ...to: - Name: x - -... to: nothing Alternatives are: -Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of: - Application of - Variable Expression: *?: forall - DT: data type - function - ... with parameters - intrinsic pointer to instance of type DT (not function type) - ... returning - _retval__operator_deref: reference to instance of type DT (not function type) - ... with attributes: - Attribute with name: unused - - - ... to arguments - Variable Expression: x: pointer to instance of struct A with body 0 - - ... to: nothing - (types: - void - ) - Environment: -> instance of struct A with body 0 (no widening) - - -Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of: - Application of - Variable Expression: *?: forall - DT: data type - function - ... with parameters - intrinsic pointer to instance of type DT (not function type) - ... returning - _retval__operator_deref: reference to instance of type DT (not function type) - ... with attributes: - Attribute with name: unused - - - ... to arguments - Variable Expression: x: pointer to instance of struct B with body 1 - - ... to: nothing - (types: - void - ) - Environment: -> instance of struct B with body 1 (no widening) - - - -errors/completeType.cfa:35:1 error: No reasonable alternatives for expression Applying untyped: - Name: foo -...to: - Name: v - -errors/completeType.cfa:36:1 error: No reasonable alternatives for expression Applying untyped: - Name: baz -...to: - Name: v - -errors/completeType.cfa:37:1 error: No reasonable alternatives for expression Applying untyped: - Name: quux -...to: - Name: v - -errors/completeType.cfa:59:1 error: No reasonable alternatives for expression Applying untyped: - Name: baz -...to: - Name: y - -errors/completeType.cfa:60:1 error: No reasonable alternatives for expression Applying untyped: - Name: quux -...to: - Name: y - -errors/completeType.cfa:72:1 error: No alternatives with satisfiable assertions for Applying untyped: - Name: baz -...to: - Name: z - - Unsatisfiable alternative: -Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of - Variable Expression: baz: forall - T: sized data type - ... with assertions - ?=?: pointer to function - ... with parameters - reference to instance of type T (not function type) - instance of type T (not function type) - ... returning - _retval__operator_assign: instance of type T (not function type) - ... with attributes: - Attribute with name: unused - - - ?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - ... returning nothing - - ?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - instance of type T (not function type) - ... returning nothing - - ^?{}: pointer to function - ... with parameters - reference to instance of type T (not function type) - ... returning nothing - - - function - ... with parameters - pointer to instance of type T (not function type) - ... returning nothing - - ... to arguments - Variable Expression: z: pointer to instance of type T (not function type) - - (types: - void - ) - Environment: -> instance of type T (not function type) (no widening) - - Could not satisfy assertion: -?=?: pointer to function - ... with parameters - reference to instance of type _109_0_T (not function type) - instance of type _109_0_T (not function type) - ... returning - _retval__operator_assign: instance of type _109_0_T (not function type) - ... with attributes: - Attribute with name: unused - - Index: tests/errors/.expect/completeType.x64.txt =================================================================== --- tests/errors/.expect/completeType.x64.txt (revision cf5af9c8d29577a706fa60398a64924729dc5c24) +++ tests/errors/.expect/completeType.x64.txt (revision cf5af9c8d29577a706fa60398a64924729dc5c24) @@ -0,0 +1,141 @@ +errors/completeType.cfa:34:1 error: Cannot choose between 2 alternatives for expression +Generated Cast of: + Applying untyped: + Name: *? + ...to: + Name: x + +... to: nothing Alternatives are: +Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of: + Application of + Variable Expression: *?: forall + DT: data type + function + ... with parameters + intrinsic pointer to instance of type DT (not function type) + ... returning + _retval__operator_deref: reference to instance of type DT (not function type) + ... with attributes: + Attribute with name: unused + + + ... to arguments + Variable Expression: x: pointer to instance of struct A with body 0 + + ... to: nothing + (types: + void + ) + Environment: -> instance of struct A with body 0 (no widening) + + +Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of: + Application of + Variable Expression: *?: forall + DT: data type + function + ... with parameters + intrinsic pointer to instance of type DT (not function type) + ... returning + _retval__operator_deref: reference to instance of type DT (not function type) + ... with attributes: + Attribute with name: unused + + + ... to arguments + Variable Expression: x: pointer to instance of struct B with body 1 + + ... to: nothing + (types: + void + ) + Environment: -> instance of struct B with body 1 (no widening) + + + +errors/completeType.cfa:35:1 error: No reasonable alternatives for expression Applying untyped: + Name: foo +...to: + Name: v + +errors/completeType.cfa:36:1 error: No reasonable alternatives for expression Applying untyped: + Name: baz +...to: + Name: v + +errors/completeType.cfa:37:1 error: No reasonable alternatives for expression Applying untyped: + Name: quux +...to: + Name: v + +errors/completeType.cfa:59:1 error: No reasonable alternatives for expression Applying untyped: + Name: baz +...to: + Name: y + +errors/completeType.cfa:60:1 error: No reasonable alternatives for expression Applying untyped: + Name: quux +...to: + Name: y + +errors/completeType.cfa:72:1 error: No alternatives with satisfiable assertions for Applying untyped: + Name: baz +...to: + Name: z + + Unsatisfiable alternative: +Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of + Variable Expression: baz: forall + T: sized data type + ... with assertions + ?=?: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning + _retval__operator_assign: instance of type T (not function type) + ... with attributes: + Attribute with name: unused + + + ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + ?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + instance of type T (not function type) + ... returning nothing + + ^?{}: pointer to function + ... with parameters + reference to instance of type T (not function type) + ... returning nothing + + + function + ... with parameters + pointer to instance of type T (not function type) + ... returning nothing + + ... to arguments + Variable Expression: z: pointer to instance of type T (not function type) + + (types: + void + ) + Environment: -> instance of type T (not function type) (no widening) + + Could not satisfy assertion: +?=?: pointer to function + ... with parameters + reference to instance of type _109_0_T (not function type) + instance of type _109_0_T (not function type) + ... returning + _retval__operator_assign: instance of type _109_0_T (not function type) + ... with attributes: + Attribute with name: unused + +