Skip to content

Commit 0711b57

Browse files
committed
Did a few things:
+ Added build scripts; Offered a fix for emacs mode; + Added a TODO markdown for keeping track of things; + In `irCheck.ml` a variable named effect needed to be renamed as that is reserved in ocaml now + Moved `abs` from Prelude to `lib.ml` to take advantage of pattern matching related OCaml types so it can be ad hoc + And started writing some tests + Added build scripts; Offered a fix for emacs mode; + Added a TODO markdown for keeping track of things; + In `irCheck.ml` a variable named effect needed to be renamed as that is reserved in ocaml now + Moved `abs` from Prelude to `lib.ml` to take advantage of pattern matching related OCaml types so it can be ad hoc + And started writing some tests Created TODO.md effect is now a reserved keyword in OCaml add build scripts Bits Fixing emacs script unnamed
1 parent 8963683 commit 0711b57

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed

TODO.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
<<<<<<< HEAD
66
<<<<<<< HEAD
77
<<<<<<< HEAD
8+
<<<<<<< HEAD
9+
<<<<<<< HEAD
10+
<<<<<<< HEAD
11+
<<<<<<< HEAD
12+
=======
13+
>>>>>>> 1182532d (Bits)
14+
=======
15+
>>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
16+
=======
17+
>>>>>>> c49bc11b (Did a few things:)
818
=======
919
>>>>>>> 1182532d (Bits)
1020
=======
@@ -18,14 +28,31 @@
1828
<<<<<<< HEAD
1929
<<<<<<< HEAD
2030
<<<<<<< HEAD
31+
<<<<<<< HEAD
32+
<<<<<<< HEAD
33+
<<<<<<< HEAD
34+
=======
35+
>>>>>>> c49bc11b (Did a few things:)
36+
- [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
37+
=======
38+
- [ ] Add some test cases.
39+
>>>>>>> 1765e705 (Created TODO.md)
40+
=======
2141
- [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
42+
>>>>>>> 1182532d (Bits)
43+
<<<<<<< HEAD
44+
=======
45+
- [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
46+
>>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
2247
=======
2348
- [ ] Add some test cases.
2449
>>>>>>> 1765e705 (Created TODO.md)
2550
=======
2651
- [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
2752
>>>>>>> 1182532d (Bits)
2853
=======
54+
>>>>>>> c49bc11b (Did a few things:)
55+
=======
2956
- [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
3057
>>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
3158
=======

links-mode.el

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,27 @@
4848
<<<<<<< HEAD
4949
<<<<<<< HEAD
5050
<<<<<<< HEAD
51+
<<<<<<< HEAD
52+
<<<<<<< HEAD
53+
<<<<<<< HEAD
54+
=======
55+
>>>>>>> c49bc11b (Did a few things:)
5156
(defconst links-backup-keywords
5257
=======
5358
;; TODO We should do that automatically as part of the build process somehow.
5459

5560
;; ./links --print-keywords | awk '{ print "\""$0"\""}'
5661
(defconst links-keywords
5762
>>>>>>> 7518d311 (Fixing emacs script)
63+
<<<<<<< HEAD
64+
=======
65+
(defconst links-backup-keywords
66+
>>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
67+
=======
68+
(defconst links-backup-keywords
69+
>>>>>>> 1182532d (Bits)
70+
=======
71+
>>>>>>> c49bc11b (Did a few things:)
5872
=======
5973
(defconst links-backup-keywords
6074
>>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)

0 commit comments

Comments
 (0)