Permalink
Browse files

the great renaming

  • Loading branch information...
tekknolagi committed Jan 1, 2015
1 parent 589a40d commit bb7599e2817b71384680c9e32f278a27df40bf08
View
@@ -7,12 +7,12 @@ CFLAGS += -std=c99 -pedantic -Wall -W -Werror -Wextra \
-Wwrite-strings -Wpointer-arith -Wbad-function-cast
LDFLAGS += -lm
MAIN_SRCS = src/carp.c
MAIN_SRCS = src/main.c
MAIN_OBJS = $(MAIN_SRCS:.c=.o)
# We use carp_* to avoid including carp.c (main)
LIB_SRCS = $(shell echo src/carp_*.c src/lib/*.c)
LIB_HDRS = $(shell echo src/carp_*.h src/lib/*.h)
LIB_SRCS = $(shell echo src/*.c src/lib/*.c)
LIB_HDRS = $(shell echo src/*.h src/lib/*.h)
LIB_OBJS = $(LIB_SRCS:.c=.o)
TEST_SRCS = $(shell echo tests/*.c tests/instr/*.c)
@@ -1,8 +1,8 @@
#include <inttypes.h>
#include "lib/carp_messages.h"
#include "lib/messages.h"
#include "carp_instructions.h"
#include "carp_machine.h"
#include "instructions.h"
#include "machine.h"
char carp_reverse_instr[][6] = {
"halt",
File renamed without changes.
@@ -2,12 +2,12 @@
#include <stdlib.h>
#include <assert.h>
#include "lib/carp_types.h"
#include "lib/carp_ht.h"
#include "lib/types.h"
#include "lib/ht.h"
#include "carp_tokenizer.h"
#include "carp_lexer.h"
#include "carp_machine.h"
#include "tokenizer.h"
#include "lexer.h"
#include "machine.h"
static void carp_lex_cleanup (carp_tok *);
static void carp_lex_exit (carp_tok *, carp_ht *, int);
@@ -1,8 +1,8 @@
#ifndef CARP_LEXER_H
#define CARP_LEXER_H
#include "carp_tokenizer.h"
#include "carp_machine.h"
#include "tokenizer.h"
#include "machine.h"
void carp_lex_lex (carp_machine_state *, carp_tok *);
@@ -1,5 +1,5 @@
#include <inttypes.h>
#include "carp_ht.h"
#include "ht.h"
static unsigned long carp_ht_rhash (const char *);
static unsigned long carp_ht_hash (const char *, long);
@@ -6,7 +6,7 @@
#include <string.h>
#include <assert.h>
#include "carp_types.h"
#include "types.h"
#define CARP_HT_KEY_LENGTH 15
File renamed without changes.
@@ -1,5 +1,5 @@
#include <inttypes.h>
#include "carp_stack.h"
#include "stack.h"
static bool carp_stack_full (carp_stack *);
@@ -7,7 +7,7 @@
#include <stdbool.h>
#include <assert.h>
#include "carp_types.h"
#include "types.h"
typedef struct carp_stack {
carp_value max_height;
File renamed without changes.
@@ -1,9 +1,9 @@
#include <stdlib.h>
#include <assert.h>
#include "lib/carp_messages.h"
#include "carp_lexer.h"
#include "carp_machine.h"
#include "lib/messages.h"
#include "lexer.h"
#include "machine.h"
/*
Initialize the VM - this includes lots of allocation.
@@ -1,12 +1,12 @@
#ifndef CARP_MACHINE_H
#define CARP_MACHINE_H
#include "lib/carp_types.h"
#include "lib/carp_stack.h"
#include "lib/carp_ht.h"
#include "lib/types.h"
#include "lib/stack.h"
#include "lib/ht.h"
#include "carp_registers.h"
#include "carp_instructions.h"
#include "registers.h"
#include "instructions.h"
typedef struct carp_machine_state_s {
carp_value regs[CARP_NUM_REGS];
@@ -1,6 +1,6 @@
#include <getopt.h>
#include "carp_machine.h"
#include "machine.h"
#define CARP_VERSION 0.3
@@ -2,7 +2,7 @@
#include <inttypes.h>
#include <assert.h>
#include "carp_registers.h"
#include "registers.h"
char carp_reverse_reg[][5] = {
"r0",
@@ -3,7 +3,7 @@
#include <stdio.h>
#include "lib/carp_types.h"
#include "lib/types.h"
// make register numbers easier on the eyes
typedef enum {
@@ -5,9 +5,9 @@
#include <errno.h>
#include <assert.h>
#include "carp_registers.h"
#include "carp_instructions.h"
#include "carp_tokenizer.h"
#include "registers.h"
#include "instructions.h"
#include "tokenizer.h"
char carp_reverse_type[][6] = {
"undef",
@@ -1,10 +1,10 @@
#ifndef CARP_TOKENIZER_H
#define CARP_TOKENIZER_H
#include "lib/carp_types.h"
#include "lib/types.h"
#include "carp_registers.h"
#include "carp_instructions.h"
#include "registers.h"
#include "instructions.h"
#define CARP_TOK_WORD_LENGTH 10

0 comments on commit bb7599e

Please sign in to comment.