Skip to content

Commit eb1d518

Browse files
committed
Rename strings to stringy because of linux conflicts
1 parent b5683c8 commit eb1d518

10 files changed

Lines changed: 16 additions & 16 deletions

File tree

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#ifndef PRISM_INTERNAL_STRINGS_H
2-
#define PRISM_INTERNAL_STRINGS_H
1+
#ifndef PRISM_INTERNAL_STRINGY_H
2+
#define PRISM_INTERNAL_STRINGY_H
33

4-
#include "prism/strings.h"
4+
#include "prism/stringy.h"
55

66
/*
77
* Defines an empty string. This is useful for initializing a string that will

include/prism/options.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "prism/compiler/nodiscard.h"
1111
#include "prism/compiler/nonnull.h"
1212

13-
#include "prism/strings.h"
13+
#include "prism/stringy.h"
1414

1515
#include <stdbool.h>
1616
#include <stddef.h>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
2-
* @file strings.h
2+
* @file stringy.h
33
*
44
* A generic string type that can have various ownership semantics.
55
*/
6-
#ifndef PRISM_STRINGS_H
7-
#define PRISM_STRINGS_H
6+
#ifndef PRISM_STRINGY_H
7+
#define PRISM_STRINGY_H
88

99
#include "prism/compiler/exported.h"
1010
#include "prism/compiler/nonnull.h"

prism.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Gem::Specification.new do |spec|
8282
"include/prism/internal/source.h",
8383
"include/prism/internal/static_literals.h",
8484
"include/prism/internal/strncasecmp.h",
85-
"include/prism/internal/strings.h",
85+
"include/prism/internal/stringy.h",
8686
"include/prism/internal/strpbrk.h",
8787
"include/prism/internal/tokens.h",
8888
"include/prism/arena.h",
@@ -104,7 +104,7 @@ Gem::Specification.new do |spec|
104104
"include/prism/source.h",
105105
"include/prism/stream.h",
106106
"include/prism/string_query.h",
107-
"include/prism/strings.h",
107+
"include/prism/stringy.h",
108108
"include/prism/version.h",
109109
"lib/prism.rb",
110110
"lib/prism/compiler.rb",
@@ -215,7 +215,7 @@ Gem::Specification.new do |spec|
215215
"src/source.c",
216216
"src/static_literals.c",
217217
"src/string_query.c",
218-
"src/strings.c",
218+
"src/stringy.c",
219219
"src/strncasecmp.c",
220220
"src/strpbrk.c",
221221
"src/tokens.c"

src/options.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "prism/internal/allocator.h"
66
#include "prism/internal/char.h"
7-
#include "prism/internal/strings.h"
7+
#include "prism/internal/stringy.h"
88

99
#include <stdlib.h>
1010
#include <string.h>

src/prism.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "prism/internal/serialize.h"
2525
#include "prism/internal/source.h"
2626
#include "prism/internal/static_literals.h"
27-
#include "prism/internal/strings.h"
27+
#include "prism/internal/stringy.h"
2828
#include "prism/internal/strncasecmp.h"
2929
#include "prism/internal/strpbrk.h"
3030
#include "prism/internal/tokens.h"

src/regexp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "prism/internal/encoding.h"
99
#include "prism/internal/memchr.h"
1010
#include "prism/internal/parser.h"
11-
#include "prism/internal/strings.h"
11+
#include "prism/internal/stringy.h"
1212
#include "prism/internal/strncasecmp.h"
1313

1414
#include <assert.h>

src/static_literals.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "prism/internal/buffer.h"
88
#include "prism/internal/integer.h"
99
#include "prism/internal/isinf.h"
10-
#include "prism/internal/strings.h"
10+
#include "prism/internal/stringy.h"
1111

1212
#include <assert.h>
1313
#include <math.h>

src/strings.c renamed to src/stringy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "prism/internal/strings.h"
1+
#include "prism/internal/stringy.h"
22

33
#include "prism/internal/allocator.h"
44

templates/include/prism/ast.h.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "prism/arena.h"
1515
#include "prism/constant_pool.h"
1616
#include "prism/integer.h"
17-
#include "prism/strings.h"
17+
#include "prism/stringy.h"
1818

1919
#include <stddef.h>
2020
#include <stdint.h>

0 commit comments

Comments
 (0)