Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds support for optional args, with backwards compatibility #64

Merged
merged 12 commits into from
May 15, 2017
+175 −91
Merged

adds support for optional args, with backwards compatibility #64

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ba88fab
testing optional args
dmalan Apr 9, 2017
a3c8f30
adding support for optional arguments
dmalan Apr 9, 2017
5932357
experimenting with optional args
dmalan Apr 9, 2017
28e72f5
experimenting with optional args
dmalan Apr 9, 2017
b4de9b3
updated comments
dmalan Apr 9, 2017
4692380
added support for optional arguments, but relying on std=gnu99
dmalan Apr 9, 2017
6164483
added __GNUC__ check
dmalan Apr 13, 2017
3b19c8d
fixed comments in get_string
dmalan Apr 29, 2017
5d33147
corrected get_char's comments
dmalan Apr 29, 2017
72d6083
fixed eprintf's comments
dmalan Apr 29, 2017
f7569b5
Merge branch 'master' into optional-args
dmalan May 15, 2017
7c75529
Merge branch 'master' into optional-args
dmalan May 15, 2017
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
Prev Previous commit
Next Next commit
added __GNUC__ check
@dmalan
dmalan committed Apr 13, 2017
commit 61644836b6b1e548104a9eaf4610e8db5ac91dd5
14 changes: 14 additions & 0 deletions src/cs50.h
View file
Original file line number Diff line number Diff line change
@@ -50,13 +50,15 @@
* Temporarily used to make arguments to get_* (but not Get*) optional.
* Inspired by https://gustedt.wordpress.com/2010/06/03/default-arguments-for-c99/.
*/
#ifdef __GNUC__
#define _ARGS(_0, _1, _2, ...) _2
#define ARGS(...) _ARGS(, ##__VA_ARGS__, 1, 0)
#define ARG_0(NAME) NULL
#define ARG_1(NAME, a) a
#define __ZERO_OR_ONE_ARG(NAME, N, ...) ARG_ ## N (NAME, ##__VA_ARGS__)
#define _ZERO_OR_ONE_ARG(NAME, N, ...) __ZERO_OR_ONE_ARG(NAME, N, ##__VA_ARGS__)
#define ZERO_OR_ONE_ARG(NAME, ...) NAME(_ZERO_OR_ONE_ARG(NAME, ARGS(__VA_ARGS__), ##__VA_ARGS__))
#endif

/**
* Our own data type for string variables.
@@ -91,7 +93,9 @@ void eprintf(const char *file, int line, const char *format, ...) __attribute__(
*/
char get_char(string prompt);
char GetChar(void) __attribute__((deprecated));
#ifdef __GNUC__
#define get_char(...) ZERO_OR_ONE_ARG(get_char, ##__VA_ARGS__)
#endif

/**
* Prompts user for a line of text from standard input and returns the
@@ -101,7 +105,9 @@ char GetChar(void) __attribute__((deprecated));
*/
double get_double(string prompt);
double GetDouble(void) __attribute__((deprecated));
#ifdef __GNUC__
#define get_double(...) ZERO_OR_ONE_ARG(get_double, ##__VA_ARGS__)
#endif

/**
* Prompts user for a line of text from standard input and returns the
@@ -111,7 +117,9 @@ double GetDouble(void) __attribute__((deprecated));
*/
float get_float(string prompt);
float GetFloat(void) __attribute__((deprecated));
#ifdef __GNUC__
#define get_float(...) ZERO_OR_ONE_ARG(get_float, ##__VA_ARGS__)
#endif

/**
* Prompts user for a line of text from standard input and returns the
@@ -121,7 +129,9 @@ float GetFloat(void) __attribute__((deprecated));
*/
int get_int(string prompt);
int GetInt(void) __attribute__((deprecated));
#ifdef __GNUC__
#define get_int(...) ZERO_OR_ONE_ARG(get_int, ##__VA_ARGS__)
#endif

/**
* Prompts user for a line of text from standard input and returns the
@@ -131,7 +141,9 @@ int GetInt(void) __attribute__((deprecated));
*/
long long get_long_long(string prompt);
long long GetLongLong(void) __attribute__((deprecated));
#ifdef __GNUC__
#define get_long_long(...) ZERO_OR_ONE_ARG(get_long_long, ##__VA_ARGS__)
#endif

/**
* Prompts user for a line of text from standard input and returns
@@ -143,6 +155,8 @@ long long GetLongLong(void) __attribute__((deprecated));
*/
string get_string(string prompt);
string GetString(void) __attribute__((deprecated));
#ifdef __GNUC__
#define get_string(...) ZERO_OR_ONE_ARG(get_string, ##__VA_ARGS__)
#endif

#endif