prism 2.0.0.rc2-x86_64-linux-gnu → 2.0.0-x86_64-linux-gnu

data/src/source.c

@@ -377,7 +377,13 @@ pm_source_stream_read(pm_source_t *source) {
      */
 #define LINE_FILL 0xff
 
-    while (memset(line, LINE_FILL, LINE_SIZE), source->stream.fgets(line, LINE_SIZE, source->stream.stream) != NULL) {
+    /*
+     * The fgets and feof members share their names with standard library
+     * functions, which <stdio.h> may define as function-like macros (newlib on
+     * Cygwin does this for feof). Parenthesizing the member access keeps those
+     * macros from expanding at the call sites.
+     */
+    while (memset(line, LINE_FILL, LINE_SIZE), (source->stream.fgets)(line, LINE_SIZE, source->stream.stream) != NULL) {
         /*
          * Locate the NUL terminator written by fgets (the last NUL in the
          * buffer) to recover the length of the chunk, then drop the terminator.
@@ -408,7 +414,7 @@ pm_source_stream_read(pm_source_t *source) {
          * EOF. A newline-terminated line needs no such check: if it happens to
          * be the last line, the next fgets returns NULL and ends the loop.
          */
-        if (!newline && !source->stream.feof(source->stream.stream)) {
+        if (!newline && !(source->stream.feof)(source->stream.stream)) {
             continue;
         }
 

data/src/stringy.c

@@ -1,9 +1,6 @@
 #include "prism/internal/stringy.h"
 
-#include "prism/internal/allocator.h"
-
 #include <assert.h>
-#include <stdlib.h>
 #include <string.h>
 
 /**
@@ -14,34 +11,17 @@ pm_string_shared_init(pm_string_t *string, const uint8_t *start, const uint8_t *
     assert(start <= end);
 
     *string = (pm_string_t) {
-        .type = PM_STRING_SHARED,
         .source = start,
         .length = (size_t) (end - start)
     };
 }
 
 /**
- * Initialize an owned string that is responsible for freeing allocated memory.
- */
-void
-pm_string_owned_init(pm_string_t *string, uint8_t *source, size_t length) {
-    *string = (pm_string_t) {
-        .type = PM_STRING_OWNED,
-        .source = source,
-        .length = length
-    };
-}
-
-/**
- * Initialize a constant string that doesn't own its memory source.
+ * Initialize a string that views the given bytes.
  */
 void
-pm_string_constant_init(pm_string_t *string, const char *source, size_t length) {
-    *string = (pm_string_t) {
-        .type = PM_STRING_CONSTANT,
-        .source = (const uint8_t *) source,
-        .length = length
-    };
+pm_string_init(pm_string_t *string, const uint8_t *source, size_t length) {
+    *string = (pm_string_t) { .source = source, .length = length };
 }
 
 /**
@@ -79,13 +59,3 @@ const uint8_t *
 pm_string_source(const pm_string_t *string) {
     return string->source;
 }
-
-/**
- * Free the associated memory of the given string.
- */
-void
-pm_string_cleanup(pm_string_t *string) {
-    if (string->type == PM_STRING_OWNED) {
-        xfree_sized((void *) string->source, string->length);
-    }
-}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0
 platform: x86_64-linux-gnu
 authors:
 - Ruby developers
@@ -47,15 +47,22 @@ files:
 - ext/prism/extension.c
 - ext/prism/extension.h
 - include/prism.h
+- include/prism.hpp
 - include/prism/arena.h
+- include/prism/arena.hpp
 - include/prism/ast.h
+- include/prism/ast.hpp
 - include/prism/buffer.h
+- include/prism/buffer.hpp
 - include/prism/comments.h
 - include/prism/compiler/accel.h
 - include/prism/compiler/align.h
 - include/prism/compiler/assume.h
+- include/prism/compiler/branch.h
 - include/prism/compiler/bswap.h
+- include/prism/compiler/cplusplus.hpp
 - include/prism/compiler/endianness.h
+- include/prism/compiler/exceptions.hpp
 - include/prism/compiler/exported.h
 - include/prism/compiler/fallthrough.h
 - include/prism/compiler/filesystem.h
@@ -63,6 +70,7 @@ files:
 - include/prism/compiler/force_inline.h
 - include/prism/compiler/format.h
 - include/prism/compiler/inline.h
+- include/prism/compiler/lifetimebound.hpp
 - include/prism/compiler/nodiscard.h
 - include/prism/compiler/nonnull.h
 - include/prism/compiler/unused.h
@@ -103,14 +111,19 @@ files:
 - include/prism/line_offset_list.h
 - include/prism/magic_comments.h
 - include/prism/node.h
+- include/prism/node.hpp
+- include/prism/node_type.hpp
 - include/prism/options.h
+- include/prism/options.hpp
 - include/prism/parser.h
+- include/prism/parser.hpp
 - include/prism/prettyprint.h
 - include/prism/serialize.h
 - include/prism/source.h
 - include/prism/stream.h
 - include/prism/string_query.h
 - include/prism/stringy.h
+- include/prism/stringy.hpp
 - include/prism/version.h
 - lib/prism.rb
 - lib/prism/3.3/prism.so