Index: src/Parser/lex.ll =================================================================== --- src/Parser/lex.ll (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/Parser/lex.ll (revision 0a208b842a9212f139dda75575089886452b6015) @@ -10,6 +10,6 @@ * Created On : Sat Sep 22 08:58:10 2001 * Last Modified By : Peter A. Buhr - * Last Modified On : Thu May 18 09:03:49 2017 - * Update Count : 513 + * Last Modified On : Mon May 22 07:46:30 2017 + * Update Count : 525 */ @@ -377,30 +377,30 @@ "?"{op_binary_over}"?" { IDENTIFIER_RETURN(); } // binary /* - This rule handles ambiguous cases with operator identifiers, e.g., "int *?*?()", where the string "*?*?" - can be lexed as "*"/"?*?" or "*?"/"*?". Since it is common practise to put a unary operator juxtaposed - to an identifier, e.g., "*i", users will be annoyed if they cannot do this with respect to operator - identifiers. Even with this special hack, there are 5 general cases that cannot be handled. The first - case is for the function-call identifier "?()": - - int * ?()(); // declaration: space required after '*' - * ?()(); // expression: space required after '*' - - Without the space, the string "*?()" is ambiguous without N character look ahead; it requires scanning - ahead to determine if there is a '(', which is the start of an argument/parameter list. - - The 4 remaining cases occur in expressions: - - i++?i:0; // space required before '?' - i--?i:0; // space required before '?' - i?++i:0; // space required after '?' - i?--i:0; // space required after '?' - - In the first two cases, the string "i++?" is ambiguous, where this string can be lexed as "i"/"++?" or - "i++"/"?"; it requires scanning ahead to determine if there is a '(', which is the start of an argument - list. In the second two cases, the string "?++x" is ambiguous, where this string can be lexed as - "?++"/"x" or "?"/"++x"; it requires scanning ahead to determine if there is a '(', which is the start of - an argument list. + This rule handles ambiguous cases with operator identifiers, e.g., "int *?*?()", where the string "*?*?" can be + lexed as "*?"/"*?" or "*"/"?*?". Since it is common practise to put a unary operator juxtaposed to an identifier, + e.g., "*i", users will be annoyed if they cannot do this with respect to operator identifiers. Therefore, there is + a lexical look-ahead for the second case, with backtracking to return the leading unary operator and then + reparsing the trailing operator identifier. Otherwise a space is needed between the unary operator and operator + identifier to disambiguate this common case. + + A similar issue occurs with the dereference, *?(...), and routine-call, ?()(...) identifiers. The ambiguity + occurs when the deference operator has no parameters, *?() and *?()(...), requiring arbitrary whitespace + look-ahead for the routine-call parameter-list to disambiguate. However, the dereference operator must have a + parameter/argument to dereference *?(...). Hence, always interpreting the string *?() as * ?() does not preclude + any meaningful program. + + The remaining cases are with the increment/decrement operators and conditional expression: + + i++? ...(...); + i?++ ...(...); + + requiring arbitrary whitespace look-ahead for the operator parameter-list, even though that interpretation is an + incorrect expression (juxtaposed identifiers). Therefore, it is necessary to disambiguate these cases with a + space: + + i++ ? i : 0; + i? ++i : 0; */ -{op_unary}"?"({op_unary_pre_post}|"[?]"|{op_binary_over}"?") { +{op_unary}"?"({op_unary_pre_post}|"()"|"[?]"|{op_binary_over}"?") { // 1 or 2 character unary operator ? int i = yytext[1] == '?' ? 1 : 2; Index: src/libcfa/containers/maybe =================================================================== --- src/libcfa/containers/maybe (revision 0a208b842a9212f139dda75575089886452b6015) +++ src/libcfa/containers/maybe (revision 0a208b842a9212f139dda75575089886452b6015) @@ -0,0 +1,56 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// maybe -- May contain a value. +// +// Author : Andrew Beach +// Created On : Wed May 25 14:43:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Apr 25 16:58:00 2017 +// Update Count : 1 +// + + +#ifndef MAYBE_H +#define MAYBE_H + + +// DO NOT USE DIRECTLY! +forall(otype T) +struct maybe { + _Bool has_value; + T value; +}; + + +forall(otype T) +void ?{}(maybe(T) * this); + +forall(otype T) +void ?{}(maybe(T) * this, T value); + +forall(otype T) +void ?{}(maybe(T) * this, maybe(T) other); + +forall(otype T) +void ^?{}(maybe(T) * this); + +forall(otype T) +_Bool ?!=?(result(T, E) this, zero_t); + +forall(otype T) +maybe(T) maybe_value(T value); + +forall(otype T) +maybe(T) maybe_none(); + +forall(otype T) +_Bool has_value(maybe(T) * this); + +forall(otype T) +T get(maybe(T) * this); + +#endif // MAYBE_H Index: src/libcfa/containers/maybe.c =================================================================== --- src/libcfa/containers/maybe.c (revision 0a208b842a9212f139dda75575089886452b6015) +++ src/libcfa/containers/maybe.c (revision 0a208b842a9212f139dda75575089886452b6015) @@ -0,0 +1,70 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// maybe.c -- May contain a value. +// +// Author : Andrew Beach +// Created On : Wed May 25 15:40:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Wed May 25 17:00:00 2017 +// Update Count : 1 +// + +#include +#include + + +forall(otype T) +void ?{}(maybe(T) * this) { + this->has_value = false; +} + +forall(otype T) +void ?{}(maybe(T) * this, T value) { + this->has_value = true; + this->value = value; +} + +forall(otype T) +void ?{}(maybe(T) * this, maybe(T) other) { + this->has_value = other.has_value; + if (other.has_value) { + this->value = other.value; + } +} + +forall(otype T) +void ^?{}(maybe(T) * this) { + if (this->has_value) { + ^(this->value){}; + } +} + +forall(otype T) +_Bool ?!=?(result(T, E) this, zero_t) { + return !this->has_value; +} + +forall(otype T) +maybe(T) maybe_value(T value) { + return (Maybe(T)){value}; +} + +forall(otype T) +maybe(T) maybe_none() { + return (Maybe(T)){}; +} + +forall(otype T) +_Bool has_value(maybe(T) * this) { + return this->has_value; +} + +forall(otype T) +T get(maybe(T) * this) { + assertf(this->has_value, "attempt to get from maybe without value"); + return this->value; +} Index: src/libcfa/containers/result =================================================================== --- src/libcfa/containers/result (revision 0a208b842a9212f139dda75575089886452b6015) +++ src/libcfa/containers/result (revision 0a208b842a9212f139dda75575089886452b6015) @@ -0,0 +1,65 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// result -- Contains the expected value or an error value. +// +// Author : Andrew Beach +// Created On : Wed May 25 14:45:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Wed May 25 16:57:00 2017 +// Update Count : 1 +// + + +#ifndef RESULT_H +#define RESULT_H + + +// DO NOT USE DIRECTLY! +forall(otype T, otype E) +struct result { + _Bool has_value; + union { + T value; + E error; + }; +}; + + +forall(otype T, otype E) +void ?{}(result(T, E) * this); + +forall(otype T, otype E) +void ?{}(result(T, E) * this, one_t, T value); + +forall(otype T, otype E) +void ?{}(result(T, E) * this, zero_t, E error); + +forall(otype T, otype E) +void ?{}(result(T, E) * this, result(T, E) other); + +forall(otype T, otype E) +void ^?{}(result(T, E) * this); + +forall(otype T, otype E) +_Bool ?!=?(result(T, E) this, zero_t); + +forall(otype T, otype E) +result(T, E) result_value(T value); + +forall(otype T, otype E) +result(T, E) result_error(E error); + +forall(otype T, otype E) +_Bool has_value(result(T, E) * this); + +forall(otype T, otype E) +T get(result(T, E) * this); + +forall(otype T, otype E) +E get_error(result(T, E) * this); + +#endif // RESULT_H Index: src/libcfa/containers/result.c =================================================================== --- src/libcfa/containers/result.c (revision 0a208b842a9212f139dda75575089886452b6015) +++ src/libcfa/containers/result.c (revision 0a208b842a9212f139dda75575089886452b6015) @@ -0,0 +1,87 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// result.c -- Contains the expected value or an error value. +// +// Author : Andrew Beach +// Created On : Wed May 25 15:40:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Wed May 25 17:02:00 2017 +// Update Count : 1 +// + +#include +#include + + +forall(otype T, otype E) +void ?{}(result(T, E) * this) { + this->has_value = false; + (this->error){}; +} + +forall(otype T, otype E) +void ?{}(result(T, E) * this, one_t, T value) { + this->has_value = true; + this->value = value; +} + +forall(otype T, otype E) +void ?{}(result(T, E) * this, zero_t, E error) { + this->has_value = false; + this->error = error; +} + +forall(otype T, otype E) +void ?{}(result(T, E) * this, result(T, E) other) { + this->has_value = other.has_value; + if (other.has_value) { + this->value = other.value; + } else { + this->error = other.error; + } +} + +forall(otype T, otype E) +void ^?{}(result(T, E) * this) { + if (this->has_value) { + ^(this->value){}; + } else { + ^(this->error){}; + } +} + +forall(otype T, otype E) +_Bool ?!=?(result(T, E) this, zero_t) { + return !this->has_value; +} + +forall(otype T, otype E) +result(T, E) result_value(T value) { + return (Result(T, E)){1, value}; +} + +forall(otype T, otype E) +result(T, E) result_error(E error) { + return (Result(T, E)){0, value}; +} + +forall(otype T, otype E) +_Bool has_value(result(T, E) * this) { + return this->has_value; +} + +forall(otype T, otype E) +T get(result(T, E) * this) { + assertf(this->has_value, "attempt to get from result without value"); + return this->value; +} + +forall(otype T, otype E) +E get_error(result(T, E) * this) { + assertf(this->has_value, "attempt to get from result without error"); + return this->error; +} Index: src/libcfa/math =================================================================== --- src/libcfa/math (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/libcfa/math (revision 0a208b842a9212f139dda75575089886452b6015) @@ -10,6 +10,6 @@ // Created On : Mon Apr 18 23:37:04 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Apr 24 12:45:02 2016 -// Update Count : 59 +// Last Modified On : Wed May 24 17:40:39 2017 +// Update Count : 60 // @@ -20,11 +20,4 @@ #include // fpclassify, isfinite, isnormal, isnan, isinf } // extern "C" - -float fabs( float ); -// extern "C" { double fabs( double ); } -long double fabs( long double ); -float cabs( float _Complex ); -// extern "C" { double cabs( double _Complex ); } -long double cabs( long double _Complex ); float ?%?( float, float ); Index: src/libcfa/math.c =================================================================== --- src/libcfa/math.c (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/libcfa/math.c (revision 0a208b842a9212f139dda75575089886452b6015) @@ -10,6 +10,6 @@ // Created On : Tue Apr 19 22:23:08 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Apr 24 08:52:31 2016 -// Update Count : 75 +// Last Modified On : Tue May 23 22:52:13 2017 +// Update Count : 76 // @@ -19,9 +19,4 @@ #include } // extern "C" - -float fabs( float x ) { return fabsf( x ); } -long double fabs( long double x ) { return fabsl( x ); } -float cabs( float _Complex x ) { return cabsf( x ); } -long double cabs( long double _Complex x ) { return cabsl( x ); } float ?%?( float x, float y ) { return fmodf( x, y ); } Index: src/libcfa/stdlib =================================================================== --- src/libcfa/stdlib (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/libcfa/stdlib (revision 0a208b842a9212f139dda75575089886452b6015) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 17:12:35 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue May 9 08:42:44 2017 -// Update Count : 107 +// Last Modified On : Wed May 24 18:06:27 2017 +// Update Count : 115 // @@ -28,5 +28,4 @@ //--------------------------------------- -extern "C" { void * malloc( size_t ); } // use default C routine for void * forall( dtype T | sized(T) ) T * malloc( void ); forall( dtype T | sized(T) ) T * malloc( char fill ); @@ -42,9 +41,4 @@ forall( dtype T | sized(T) ) T * memalign( size_t alignment ); // deprecated forall( dtype T | sized(T) ) int posix_memalign( T ** ptr, size_t alignment ); - -extern "C" { -void * memset( void * ptr, int fill, size_t size ); -void free( void * ptr ); -} // extern "C" forall( dtype T, ttype Params | sized(T) | { void ?{}(T *, Params); } ) T * new( Params p ); @@ -109,5 +103,5 @@ double abs( double _Complex ); long double abs( long double _Complex ); -forall ( otype T | { void ?{}( T *, zero_t ); int ? #include @@ -20,2 +35,7 @@ #endif // __CFA } + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa complex.c" // +// End: // Index: src/tests/gmp.c =================================================================== --- src/tests/gmp.c (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/tests/gmp.c (revision 0a208b842a9212f139dda75575089886452b6015) @@ -10,6 +10,6 @@ // Created On : Tue Apr 19 08:55:51 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon May 22 09:05:09 2017 -// Update Count : 538 +// Last Modified On : Wed May 24 22:05:38 2017 +// Update Count : 540 // @@ -88,5 +88,5 @@ sout | (int)0 | fact | endl; for ( unsigned int i = 1; i <= 40; i += 1 ) { - fact = fact * i; // general case + fact *= i; // general case sout | i | fact | endl; } // for @@ -94,5 +94,5 @@ // Local Variables: // -// mode: c // // tab-width: 4 // +// compile-command: "cfa gmp.c -l gmp" // // End: // Index: src/tests/math.c =================================================================== --- src/tests/math.c (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/tests/math.c (revision 0a208b842a9212f139dda75575089886452b6015) @@ -10,6 +10,6 @@ // Created On : Fri Apr 22 14:59:21 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Apr 24 13:24:20 2016 -// Update Count : 70 +// Last Modified On : Wed May 24 13:04:33 2017 +// Update Count : 71 // @@ -22,5 +22,4 @@ long double l; - sout | "fabs:" | fabs( -1.0F ) | fabs( -1.0D ) | fabs( -1.0L ) | cabs( -1.0F+1.0FI ) | cabs( -1.0D+1.0DI ) | cabs( -1.0DL+1.0LI ) | endl; sout | "fmod:" | 5.0F % -2.0F | fmod( 5.0F, -2.0F ) | 5.0D % -2.0D | fmod( 5.0D, -2.0D ) | 5.0L % -2.0L | fmod( 5.0L, -2.0L ) | endl; sout | "remainder:" | remainder( 2.0F, 3.0F ) | remainder( 2.0D, 3.0D ) | remainder( 2.0L, 3.0L ) | endl; Index: src/tests/numericConstants.c =================================================================== --- src/tests/numericConstants.c (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/tests/numericConstants.c (revision 0a208b842a9212f139dda75575089886452b6015) @@ -1,2 +1,17 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// numericConstants.c -- +// +// Author : Peter A. Buhr +// Created On : Wed May 24 22:10:36 2017 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed May 24 22:11:36 2017 +// Update Count : 2 +// + int main() { 1; // decimal @@ -48,3 +63,8 @@ 0x_ff.ffp0; // hex real 0x_1.ffff_ffff_p_128_l; -} +} // main + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa minmax.c" // +// End: // Index: src/tests/rational.c =================================================================== --- src/tests/rational.c (revision a8e64c4029370bc62f193afaf75b9ad8e7f8a7df) +++ src/tests/rational.c (revision 0a208b842a9212f139dda75575089886452b6015) @@ -10,6 +10,6 @@ // Created On : Mon Mar 28 08:43:12 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon May 15 21:32:22 2017 -// Update Count : 64 +// Last Modified On : Wed May 17 15:46:35 2017 +// Update Count : 65 //