Merge pull request #5 from Shopify/fix-c-api-ci

Fix c-api branch's build

Author: st0012

include/rbs/defines.h

@@ -51,6 +51,10 @@
  * Custom defines for RBS                                                                                              *
  **********************************************************************************************************************/
 
+#if defined(_MSC_VER)
+#define NODISCARD _Check_return_
+#else
 #define NODISCARD __attribute__((warn_unused_result))
+#endif
 
 #endif

include/rbs/parserstate.h

@@ -130,6 +130,11 @@ lexstate *alloc_lexer(rbs_allocator_t *, rbs_string_t string, const rbs_encoding
 parserstate *alloc_parser(rbs_string_t string, const rbs_encoding_t *encoding, int start_pos, int end_pos);
 void free_parser(parserstate *parser);
 
+/**
+ * Declare type variables to be used during parsing.
+ * */
+void rbs_parser_declare_type_variables(parserstate *parser, size_t count, const char **variables);
+
 /**
  * Advance one token.
  * */

make_signed_ruby.rb

@@ -123,8 +123,6 @@ def sign_bundle(bundle_path)
 		PLIST
 
 		Tempfile.create("entitlements.plist") do |entitlements_file|
-			entitlements_path = entitlements_file.path
-
 			args = [
 				"/usr/bin/codesign",
 				"--force", # Replace the existing signiture, if any

src/parser.c

@@ -130,11 +130,16 @@ void set_error(parserstate *state, token tok, bool syntax_error, const char *fmt
     return;
   }
 
-  char *message;
-
   va_list args;
+
   va_start(args, fmt);
-  vasprintf(&message, fmt, args);
+  int length = vsnprintf(NULL, 0, fmt, args);
+  va_end(args);
+
+  char *message = (char *) malloc(length + 1);
+
+  va_start(args, fmt);
+  vsnprintf(message, length + 1, fmt, args);
   va_end(args);
 
   state->error = (error *)malloc(sizeof(error));
@@ -202,15 +207,15 @@ static bool parse_type_name(parserstate *state, TypeNameKind kind, range *rg, rb
   switch (state->current_token.type) {
     case tLIDENT:
       if (kind & ALIAS_NAME) goto success;
-      goto error;
+      goto error_handling;
     case tULIDENT:
       if (kind & INTERFACE_NAME) goto success;
-      goto error;
+      goto error_handling;
     case tUIDENT:
       if (kind & CLASS_NAME) goto success;
-      goto error;
+      goto error_handling;
     default:
-      goto error;
+      goto error_handling;
   }
 
   success: {
@@ -225,8 +230,8 @@ static bool parse_type_name(parserstate *state, TypeNameKind kind, range *rg, rb
     return true;
   }
 
-  error: {
-    const char *ids;
+  error_handling: {
+    const char *ids = NULL;
     if (kind & ALIAS_NAME) {
       ids = "alias name";
     }
@@ -237,6 +242,8 @@ static bool parse_type_name(parserstate *state, TypeNameKind kind, range *rg, rb
       ids = "class/module/constant name";
     }
 
+    assert(ids != NULL && "Unknown kind of type");
+
     set_error(state, state->current_token, true, "expected one of %s", ids);
     return false;
   }

src/parserstate.c

@@ -355,7 +355,7 @@ parserstate *alloc_parser(rbs_string_t string, const rbs_encoding_t *encoding, i
   return parser;
 }
 
-void rbs_parser_declare_type_variables(parserstate *parser, size_t count, const char *variables[count]) {
+void rbs_parser_declare_type_variables(parserstate *parser, size_t count, const char **variables) {
   if (variables == NULL) return; // Nothing to do.
 
   parser_push_typevar_table(parser, true);

src/util/rbs_allocator.c

@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h> // for memset()
+#include <stdint.h>
 
 #ifdef _WIN32
     #include <windows.h>