From 668afe99c238cdc02466ae4e22f62dd1d8e42716 Mon Sep 17 00:00:00 2001
From: Victor Fernandes <victorvalenca@gmail.com>
Date: Mon, 13 Mar 2017 19:14:01 -0400
Subject: [PATCH] merge

---
 PLATYPUS Grammar Specification.md | 8 ++++----
 buffer.c                          | 4 ++--
 buffer.h                          | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/PLATYPUS Grammar Specification.md b/PLATYPUS Grammar Specification.md
index a725358..7fdca68 100644
--- a/PLATYPUS Grammar Specification.md	
+++ b/PLATYPUS Grammar Specification.md	
@@ -58,11 +58,11 @@ This does not follow standard BNF/EBNF syntax, I will rewrite it once I get all
 <letters or digits> ::=
     <letter or digit> | <letters or digits> <letter or digit>
 
-<letter> ::= one of
-    [a-z][A-Z]
+<letter> ::= 
+    [a-z] | [A-Z]
 
-<letter or digit> ::= one of
-    [a-z][A-Z][0-9]
+<letter or digit> ::= 
+    <letter> | <digit>
 
 <string variable identifier> ::=
     <arithmetic variable identifier># 
diff --git a/buffer.c b/buffer.c
index 3c214a0..a469a24 100644
--- a/buffer.c
+++ b/buffer.c
@@ -217,8 +217,8 @@ to cb_head at that offset
  */
 char* b_setmark(Buffer* const pBD, short mark) {
     if (!pBD || mark < 0 || mark > pBD->addc_offset) { return NULL; }
-    pBD->mark_coffset = mark;
-    return (pBD->cb_head) + pBD->mark_coffset;
+    pBD->mark_offset = mark;
+    return (pBD->cb_head) + pBD->mark_offset;
 }
 
 /* Reports the end-of-buffer flag state of the character buffer
diff --git a/buffer.h b/buffer.h
index 8148777..dd0039e 100755
--- a/buffer.h
+++ b/buffer.h
@@ -19,7 +19,7 @@
 
 /* standard header files */
 #include <stdio.h>  /* standard input/output */
-#include <mm_malloc.h> /* for dynamic memory allocation.*/
+#include <malloc.h> /* for dynamic memory allocation.*/
 #include <limits.h> /* implementation-defined data type ranges and limits */
 
 /* constant definitions */