Skip to content

Commit 07f90a8

Browse files
hvellyrhvellyr
committed
Rename .h7 back to .hr
1 parent c123338 commit 07f90a8

File tree

564 files changed

+278
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

564 files changed

+278
-278
lines changed

‎BUGS

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
module X
2727
export public (y)
2828

29-
import "something.h7"
29+
import "something.hr"
3030

3131
def macro y { { y() } -> { symbol-from-something() } }
3232

3333
In this example the site using the macro y must also import
34-
something.h7, otherwise symbol-from-something is unknown
34+
something.hr, otherwise symbol-from-something is unknown
3535

3636

3737
- size of array must be constant expression. Ex.:

‎bootstrap/compiler.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -236,24 +236,24 @@ Compiler::importSystemHeaders(const String& avoidPath)
236236
{
237237
String fullAvoidPath = file::canonicalPathName(avoidPath);
238238

239-
if (!importSystemHeader(String("builtin:lang/types.h7"), fullAvoidPath))
239+
if (!importSystemHeader(String("builtin:lang/types.hr"), fullAvoidPath))
240240
return;
241241

242-
if (!importSystemHeader(String("builtin:lang/numbers.h7"), fullAvoidPath))
242+
if (!importSystemHeader(String("builtin:lang/numbers.hr"), fullAvoidPath))
243243
return;
244244

245-
if (!importSystemHeader(String("builtin:lang/comparable.h7"), fullAvoidPath))
245+
if (!importSystemHeader(String("builtin:lang/comparable.hr"), fullAvoidPath))
246246
return;
247247

248-
if (!importSystemHeader(String("builtin:lang/runtime.h7"), fullAvoidPath))
248+
if (!importSystemHeader(String("builtin:lang/runtime.hr"), fullAvoidPath))
249249
return;
250250

251-
if (!importSystemHeader(String("builtin:lang/sliceable.h7"), fullAvoidPath))
251+
if (!importSystemHeader(String("builtin:lang/sliceable.hr"), fullAvoidPath))
252252
return;
253253

254-
if (!importSystemHeader(String("builtin:lang/copyable.h7"), fullAvoidPath))
254+
if (!importSystemHeader(String("builtin:lang/copyable.hr"), fullAvoidPath))
255255
return;
256-
if (!importSystemHeader(String("builtin:lang/string.h7"), fullAvoidPath))
256+
if (!importSystemHeader(String("builtin:lang/string.hr"), fullAvoidPath))
257257
return;
258258
}
259259

‎bootstrap/filetool.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ namespace herschel
3030
//! For example
3131
//!
3232
//! <pre>
33-
//! outdir='', outfileName='', file='~/dev/abc.h7', outExt='bc'
33+
//! outdir='', outfileName='', file='~/dev/abc.hr', outExt='bc'
3434
//! => '~/dev/abc.bc'
3535
//!
36-
//! outdir='', outfileName='~/tmp/build/abc.bc', file='~/dev/abc.h7', outExt='ll'
36+
//! outdir='', outfileName='~/tmp/build/abc.bc', file='~/dev/abc.hr', outExt='ll'
3737
//! => '~/tmp/build/abc.bc'
3838
//!
39-
//! outdir='~/dev/_build', outfileName='', file='~/dev/abc.h7', outExt='bc'
39+
//! outdir='~/dev/_build', outfileName='', file='~/dev/abc.hr', outExt='bc'
4040
//! => '~/dev/_build/abc.bc'
4141
//! </pre>
4242
String makeOutputFileName(const String& outdir,

‎bootstrap/option.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ SUITE(OptionsParser)
181181
"--verbose",
182182
"-P", "8080",
183183
"-U",
184-
"abc.h7", "xyz.h7" };
184+
"abc.hr", "xyz.hr" };
185185

186186
OptionsParser p(options, 10, args);
187187
CHECK_EQUAL(p.nextOption(&option), OptionsParser::kOption);
@@ -211,11 +211,11 @@ SUITE(OptionsParser)
211211

212212
CHECK_EQUAL(p.nextOption(&option), OptionsParser::kNotAnOption);
213213
CHECK(option.fOption.isEmpty());
214-
CHECK_EQUAL(option.fArgument, String("abc.h7"));
214+
CHECK_EQUAL(option.fArgument, String("abc.hr"));
215215

216216
CHECK_EQUAL(p.nextOption(&option), OptionsParser::kNotAnOption);
217217
CHECK(option.fOption.isEmpty());
218-
CHECK_EQUAL(option.fArgument, String("xyz.h7"));
218+
CHECK_EQUAL(option.fArgument, String("xyz.hr"));
219219

220220
CHECK_EQUAL(p.nextOption(&option), OptionsParser::kNoMoreArgs);
221221
}

‎bootstrap/setup-unix.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ SetupUnix::exeFromDevpath(const char* exeName, const String& exedir,
5050
String basepath = exedir.part(0, exedir.length() - fullpath.length() + 1);
5151

5252
paths.fLibExec = exedir.part(0, exedir.length() - strlen(exeName));
53-
paths.fH7Includes = file::appendDir(file::makeDir(basepath),
53+
paths.fHrIncludes = file::appendDir(file::makeDir(basepath),
5454
String("lib"));
5555
paths.fRtLib = paths.fLibExec;
5656

@@ -88,7 +88,7 @@ SetupUnix::exeFromRuntimeInstallation(const char* exeName,
8888
// a $(prefix)/lib/herschel/x.y.z folder
8989
if (file::isDir(basePkgPath)) {
9090
paths.fLibExec = basePkgPath;
91-
paths.fH7Includes = file::appendDir(file::makeDir(basePkgPath),
91+
paths.fHrIncludes = file::appendDir(file::makeDir(basePkgPath),
9292
String("include"));
9393
paths.fRtLib = basePkgPath;
9494

@@ -120,7 +120,7 @@ SetupUnix::findSysResources(const char* exeName) const
120120
if (exeFromDevpath(exeName, exedir, paths) ||
121121
exeFromRuntimeInstallation(exeName, exedir, paths))
122122
{
123-
setup.fSysPath.push_back(paths.fH7Includes);
123+
setup.fSysPath.push_back(paths.fHrIncludes);
124124
setup.fHrcPath = file::appendFile(file::makeDir(paths.fLibExec),
125125
String("hrc"));
126126
setup.fLdPath = paths.fLlvmLdPath;

‎bootstrap/setup-unix.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ namespace herschel
3535
String fLibExec;
3636
String fLlvmLdPath;
3737

38-
// h7 header path
39-
String fH7Includes;
38+
// hr header path
39+
String fHrIncludes;
4040

4141
// runtime library path
4242
String fRtLib;

‎bootstrap/srcpos.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,29 @@ SUITE(SrcPos)
5252
TEST(AssignOp)
5353
{
5454
SrcPos pos;
55-
pos = SrcPos("abc.h7", 1211);
55+
pos = SrcPos("abc.hr", 1211);
5656
CHECK_EQUAL(pos.lineNumber(), 1211);
57-
CHECK_EQUAL(pos.file(), String("abc.h7"));
58-
CHECK_EQUAL(pos.toString(), String("abc.h7:1211"));
57+
CHECK_EQUAL(pos.file(), String("abc.hr"));
58+
CHECK_EQUAL(pos.toString(), String("abc.hr:1211"));
5959
}
6060

6161
TEST(CopyCtor)
6262
{
63-
SrcPos p("abc.h7", 1211);
63+
SrcPos p("abc.hr", 1211);
6464
SrcPos q(p);
6565
CHECK_EQUAL(q.lineNumber(), 1211);
66-
CHECK_EQUAL(q.file(), String("abc.h7"));
67-
CHECK_EQUAL(q.toString(), String("abc.h7:1211"));
66+
CHECK_EQUAL(q.file(), String("abc.hr"));
67+
CHECK_EQUAL(q.toString(), String("abc.hr:1211"));
6868
}
6969

7070

7171
TEST(EqualOp)
7272
{
73-
CHECK_EQUAL(SrcPos("abc.h7", 1211), SrcPos("abc.h7", 1211));
73+
CHECK_EQUAL(SrcPos("abc.hr", 1211), SrcPos("abc.hr", 1211));
7474
CHECK_EQUAL(SrcPos(), SrcPos());
75-
CHECK(SrcPos("abc.h7", 1211) != SrcPos("abc.h7", 1300));
76-
CHECK(SrcPos("abc.h7", 1211) != SrcPos("abx.h7", 1211));
77-
CHECK(SrcPos("abc.h7", 1211) != SrcPos("abx.h7", 1300));
75+
CHECK(SrcPos("abc.hr", 1211) != SrcPos("abc.hr", 1300));
76+
CHECK(SrcPos("abc.hr", 1211) != SrcPos("abx.hr", 1211));
77+
CHECK(SrcPos("abc.hr", 1211) != SrcPos("abx.hr", 1300));
7878
}
7979
}
8080

‎build/generic.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ $(BUILDDIR)/$(BUILDSTYLE)$(PKG)/%$(DYOEXT) : %.cpp
6868
@$(top_srcdir)/build/mkinstalldirs $(dir $@)
6969
$(CXX) $(PIC) $(CXXFLAGS) -c -o $@ $<
7070

71-
$(BUILDDIR)/$(BUILDSTYLE)$(PKG)/%.bc : %.h7
71+
$(BUILDDIR)/$(BUILDSTYLE)$(PKG)/%.bc : %.hr
7272
@$(top_srcdir)/build/mkinstalldirs $(dir $@)
7373
$(BUILDDIR)/$(BUILDSTYLE)/herschel$(APPEXT) --isys=$(top_srcdir)/lib -c -o $@ $<
7474

@@ -108,4 +108,4 @@ $(DEPS_DIR)/%.ld: %.cpp $(PRE_DEPS)
108108
.PHONY: $(DEPS_DIR)
109109

110110
.SUFFIXES:
111-
.SUFFIXES: .c .cpp .o .lo .m .d .ld .y .h
111+
.SUFFIXES: .c .cpp .o .lo .m .d .ld .y .h

‎doc/copyright.h7 ‎doc/copyright.hr

File renamed without changes.

‎doc/herschel-mode.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
;; (`.emacs'):
5454
;;
5555
;; (autoload 'herschel-mode "herschel-mode" "Herschel Mode" t)
56-
;; (setq auto-mode-alist (cons '("\\.h7\\'" . herschel-mode) auto-mode-alist))
56+
;; (setq auto-mode-alist (cons '("\\.hr\\'" . herschel-mode) auto-mode-alist))
5757

5858

5959
;; ---------------------------------------------------------------------------

‎doc/herschel.texinfo

+2-2
Original file line numberDiff line numberDiff line change
@@ -3397,8 +3397,8 @@ expression does import explicitely only the definitions of the other
33973397
code file; no implementations or global variable locations are taken over.
33983398

33993399
@example
3400-
import "stack.h7"
3401-
import "lib/collection.h7"
3400+
import "stack.hr"
3401+
import "lib/collection.hr"
34023402
@end example
34033403

34043404
The @code{import} expression is only possible on module level (i.e.@

‎doc/rosettacode.org

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Better name for it
44
Name file extension origin
55
heather .hea (from the plant erica carnea)
66
andle .an The andle stone
7-
herschel .h7 After william herschel
7+
herschel .hr After William Herschel
88

99

1010

‎examples/99beer.h7 ‎examples/99beer.hr

File renamed without changes.

‎examples/count-semicola.h7 ‎examples/count-semicola.hr

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
module examples
3434

35-
import "io.h7"
36-
import "app.h7"
35+
import "io.hr"
36+
import "app.hr"
3737

3838
def macro with-input-file
3939
{
@@ -71,8 +71,8 @@ def app|main(args @ String[])
7171
}
7272
| else {
7373
outln(port: io|stderr,
74-
"Usage: count-semicola.h7 FILE")
74+
"Usage: count-semicola.hr FILE")
7575
}
7676
}
7777

78-
-- end of count-semicola.h7
78+
-- end of count-semicola.hr

‎examples/fib.h7 ‎examples/fib.hr

File renamed without changes.

‎examples/rot13.h7 ‎examples/rot13.hr

File renamed without changes.

‎lib/clang/types.h7 ‎lib/clang/types.hr

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module clang
99

1010
export public (*)
1111

12-
import "lang/numbers.h7"
12+
import "lang/numbers.hr"
1313

1414

1515
def alias int = lang|Int32
@@ -54,6 +54,6 @@ def type ATOM
5454

5555
def alias Unichar = Char
5656

57-
-- end of clang/types.h7
57+
-- end of clang/types.hr
5858

5959

‎lib/coll/collection.h7 ‎lib/coll/collection.hr

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ export public(ForEachVisitor,
4444
HashMap, Tree, HashMap!, Tree!,
4545
MultiMap, SortedMultiMap, MultiMap!, SortedMultiMap!)
4646

47-
import "core/sliceable.h7"
48-
import "lang/iterable.h7"
49-
import "lang/iterator.h7"
47+
import "core/sliceable.hr"
48+
import "lang/iterable.hr"
49+
import "lang/iterator.hr"
5050

5151

5252
------------------------------------------------------------------------------

‎lib/coll/hash-map.h7 ‎lib/coll/hash-map.hr

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
module coll
3434
export public (HashMap)
3535

36-
import "core/core.h7"
37-
import "coll/collection.h7"
36+
import "core/core.hr"
37+
import "coll/collection.hr"
3838

3939

4040
------------------------------------------------------------------------------

‎lib/coll/impl/common.h7 ‎lib/coll/impl/common.hr

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ def for-each(coll @ 'C, func : ForEachVisitor<'T>) : 'C
7777
coll
7878

7979

80-
-- end of impl/common.h7
80+
-- end of impl/common.hr

‎lib/coll/impl/hash-map.h7 ‎lib/coll/impl/hash-map.hr

File renamed without changes.

‎lib/coll/impl/vector.h7 ‎lib/coll/impl/vector.hr

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,4 @@ extend module core
226226
VectorSlice<'T>(obj, from, to)
227227
}
228228

229-
-- end of impl/vector.h7
229+
-- end of impl/vector.hr

‎lib/coll/list.h7 ‎lib/coll/list.hr

File renamed without changes.

‎lib/coll/pair.h7 ‎lib/coll/pair.hr

File renamed without changes.

‎lib/coll/redblacktree.h7 ‎lib/coll/redblacktree.hr

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module coll
2727

2828
export public (RedBlackTree, lookup, insert, delete)
2929

30-
import "lang/assert.h7"
30+
import "lang/assert.hr"
3131

3232
def enum NodeColor : Bool {
3333
RED = false

‎lib/core/break.h7 ‎lib/core/break.hr

File renamed without changes.

‎lib/core/common.h7 ‎lib/core/common.hr

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
module core
3434
export public(*)
3535

36-
import "core/core.h7"
36+
import "core/core.hr"
3737

3838

3939
------------------------------------------------------------------------------

‎lib/core/core.h7 ‎lib/core/core.hr

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@
3030
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3131
-- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232

33-
import "core/charnm.h7"
34-
import "core/si-units.h7"
33+
import "core/charnm.hr"
34+
import "core/si-units.hr"
3535

36-
import "core/common.h7"
36+
import "core/common.hr"
3737

38-
import "core/object.h7"
38+
import "core/object.hr"
3939

40-
import "core/slice.h7"
40+
import "core/slice.hr"
4141

42-
import "core/break.h7"
42+
import "core/break.hr"
4343

44-
import "core/incr.h7"
44+
import "core/incr.hr"
4545

46-
import "core/utils.h7"
46+
import "core/utils.hr"
4747

4848

4949

50-
-- end of core.h7
50+
-- end of core.hr

‎lib/core/impl/copyable.h7 ‎lib/core/impl/copyable.hr

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
module core
3434
export public(*)
3535

36-
import "core/copyable.h7"
36+
import "core/copyable.hr"
3737

3838

3939
-- Default implementation for @fun{deep-copy}
@@ -43,4 +43,4 @@ def generic deep-copy(obj @ 'T) : 'T
4343
obj.copy.deepen
4444

4545

46-
-- end of copyable.h7
46+
-- end of copyable.hr

‎lib/core/impl/range.h7 ‎lib/core/impl/range.hr

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
module core
3434
export public(*)
3535

36-
import "core/range.h7"
36+
import "core/range.hr"
3737

3838

3939
def size(range @ Range<'T>) : Int

‎lib/core/incr.h7 ‎lib/core/incr.hr

File renamed without changes.

‎lib/core/object.h7 ‎lib/core/object.hr

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
module core
3434
export public(*)
3535

36-
import "core/core.h7"
36+
import "core/core.hr"
3737

3838
def generic octet-size(obj @ Any) : Ordinal ...
3939
~ Returns the allocation size of @var{self} in octets.
@@ -46,4 +46,4 @@ def generic octet-size(obj @ Any) : Ordinal ...
4646

4747
def generic hash-code(obj @ Any) : UInt32 ...
4848

49-
-- end of object.h7
49+
-- end of object.hr

‎lib/core/range.h7 ‎lib/core/range.hr

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
module core
3434
export public(*)
3535

36-
import "core/core.h7"
36+
import "core/core.hr"
3737

3838

3939
def class Range<T>(_first : T, _last : T)

‎lib/core/si-units.h7 ‎lib/core/si-units.hr

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
module core
3434
export public(*)
3535

36-
import "core/core.h7"
36+
import "core/core.hr"
3737

3838

3939
------------------------------------------------------------------------------
@@ -229,4 +229,4 @@ def unit kHz -> Hz (x)
229229
~ Unit: kilo Hertz. ~
230230
{ x * 1000 }
231231

232-
-- end of SI-units.h7
232+
-- end of SI-units.hr

0 commit comments

Comments
 (0)