Use inidices (not indicies) as plural of index.

fixes #60

26 files changed, 71 insertions, 71 deletions

diff --git a/aapl/ChangeLog b/aapl/ChangeLog
index ddb8968f..483ad825 100644
--- a/aapl/ChangeLog
+++ b/aapl/ChangeLog
@@ -380,7 +380,7 @@ Aapl 2.4.0 -- May 3, 2002
   and will make large integer alphabets feasible.
  -The conversion from FsmGraph to FsmMachine is now moved into a class called 
   FsmBuild.
- -FsmMachine no longer stores transition indicies as a linear chunk. Now
+ -FsmMachine no longer stores transition indices as a linear chunk. Now
   stores key, index pairs. This will facilitate using FsmMachine with very
   large alphabets because large index tables will not be allocated.  when there
   is great variation in transition keys.
diff --git a/colm/fsmcodegen.cc b/colm/fsmcodegen.cc
index 7ea10d17..5d63c079 100644
--- a/colm/fsmcodegen.cc
+++ b/colm/fsmcodegen.cc
@@ -456,7 +456,7 @@ void FsmCodeGen::emitSingleSwitch( RedState *state )
 		/* Write out single keys in a switch if there is more than one. */
 		out << "\tswitch( " << GET_WIDE_KEY(state) << " ) {\n";
 
-		/* Write out the single indicies. */
+		/* Write out the single indices. */
 		for ( int j = 0; j < numSingles; j++ ) {
 			out << "\t\tcase " << KEY(data[j].lowKey) << ": ";
 			TRANS_GOTO(data[j].value, 0) << "\n";
diff --git a/colm/pdabuild.cc b/colm/pdabuild.cc
index ba4850df..f61b45f9 100644
--- a/colm/pdabuild.cc
+++ b/colm/pdabuild.cc
@@ -2006,12 +2006,12 @@ struct pda_tables *Compiler::makePdaTables( PdaGraph *pdaGraph )
 	}
 
 
-	/* Allocate indicies and owners. */
-	pdaTables->num_indicies = count;
-	pdaTables->indicies = new int[count];
+	/* Allocate indices and owners. */
+	pdaTables->num_indices = count;
+	pdaTables->indices = new int[count];
 	pdaTables->owners = new int[count];
 	for ( long i = 0; i < count; i++ ) {
-		pdaTables->indicies[i] = -1;
+		pdaTables->indices[i] = -1;
 		pdaTables->owners[i] = -1;
 	}
 
@@ -2020,7 +2020,7 @@ struct pda_tables *Compiler::makePdaTables( PdaGraph *pdaGraph )
 	pdaTables->offsets = new unsigned int[numStates];
 	pdaTables->num_states = numStates;
 
-	/* Place transitions into indicies/owners */
+	/* Place transitions into indices/owners */
 	PdaState **states = new PdaState*[numStates];
 	long ds = 0;
 	for ( PdaStateList::Iter state = pdaGraph->stateList; state.lte(); state++ )
@@ -2039,7 +2039,7 @@ struct pda_tables *Compiler::makePdaTables( PdaGraph *pdaGraph )
 		pdaTables->offsets[state->stateNum] = indOff;
 
 		for ( TransMap::Iter trans = state->transMap; trans.lte(); trans++ ) {
-			pdaTables->indicies[indOff] = trans->value->actionSetEl->key.id;
+			pdaTables->indices[indOff] = trans->value->actionSetEl->key.id;
 			pdaTables->owners[indOff] = state->stateNum;
 			indOff++;
 
@@ -2054,7 +2054,7 @@ struct pda_tables *Compiler::makePdaTables( PdaGraph *pdaGraph )
 	}
 
 	/* We allocated the max, but cmpression gives us less. */
-	pdaTables->num_indicies = indLen;
+	pdaTables->num_indices = indLen;
 	delete[] states;
 	
 
diff --git a/colm/pdacodegen.cc b/colm/pdacodegen.cc
index 15ae658c..5e069998 100644
--- a/colm/pdacodegen.cc
+++ b/colm/pdacodegen.cc
@@ -535,11 +535,11 @@ void PdaCodeGen::writeParserData( long id, struct pda_tables *tables )
 {
 	String prefix = "pid_" + String(0, "%ld", id) + "_";
 
-	out << "static int " << prefix << indicies() << "[] = {\n\t";
-	for ( int i = 0; i < tables->num_indicies; i++ ) {
-		out << tables->indicies[i];
+	out << "static int " << prefix << indices() << "[] = {\n\t";
+	for ( int i = 0; i < tables->num_indices; i++ ) {
+		out << tables->indices[i];
 
-		if ( i < tables->num_indicies-1 ) {
+		if ( i < tables->num_indices-1 ) {
 			out << ", ";
 			if ( (i+1) % 8 == 0 )
 				out << "\n\t";
@@ -548,10 +548,10 @@ void PdaCodeGen::writeParserData( long id, struct pda_tables *tables )
 	out << "\n};\n\n";
 
 	out << "static int " << prefix << owners() << "[] = {\n\t";
-	for ( int i = 0; i < tables->num_indicies; i++ ) {
+	for ( int i = 0; i < tables->num_indices; i++ ) {
 		out << tables->owners[i];
 
-		if ( i < tables->num_indicies-1 ) {
+		if ( i < tables->num_indices-1 ) {
 			out << ", ";
 			if ( (i+1) % 8 == 0 )
 				out << "\n\t";
@@ -670,7 +670,7 @@ void PdaCodeGen::writeParserData( long id, struct pda_tables *tables )
 	out << 
 		"static struct pda_tables " << prefix << "pdaTables =\n"
 		"{\n"
-		"	" << prefix << indicies() << ",\n"
+		"	" << prefix << indices() << ",\n"
 		"	" << prefix << owners() << ",\n"
 		"	" << prefix << keys() << ",\n"
 		"	" << prefix << offsets() << ",\n"
@@ -683,7 +683,7 @@ void PdaCodeGen::writeParserData( long id, struct pda_tables *tables )
 		"	" << prefix << tokenRegions() << ",\n"
 		"	" << prefix << tokenPreRegions() << ",\n"
 		"\n"
-		"	" << tables->num_indicies << ",\n"
+		"	" << tables->num_indices << ",\n"
 		"	" << tables->num_keys << ",\n"
 		"	" << tables->num_states << ",\n"
 		"	" << tables->num_targs << ",\n"
diff --git a/colm/pdacodegen.h b/colm/pdacodegen.h
index a2cb440e..759dd6e0 100644
--- a/colm/pdacodegen.h
+++ b/colm/pdacodegen.h
@@ -51,7 +51,7 @@ struct PdaCodeGen
 	String PARSER() { return "parser_"; }
 
 	String startState() { return PARSER() + "startState"; }
-	String indicies() { return PARSER() + "indicies"; }
+	String indices() { return PARSER() + "indices"; }
 	String owners() { return PARSER() + "owners"; }
 	String keys() { return PARSER() + "keys"; }
 	String offsets() { return PARSER() + "offsets"; }
diff --git a/colm/pdarun.c b/colm/pdarun.c
index 3eceb26c..59b8a947 100644
--- a/colm/pdarun.c
+++ b/colm/pdarun.c
@@ -1372,7 +1372,7 @@ static long stack_top_target( program_t *prg, struct pda_run *pda_run )
 		unsigned shift = pda_run->stack_top->id - 
 				pda_run->pda_tables->keys[pda_run->stack_top->state<<1];
 		unsigned offset = pda_run->pda_tables->offsets[pda_run->stack_top->state] + shift;
-		int index = pda_run->pda_tables->indicies[offset];
+		int index = pda_run->pda_tables->indices[offset];
 		state = pda_run->pda_tables->targs[index];
 	}
 	return state;
@@ -1439,7 +1439,7 @@ again:
 		goto parse_error;
 	}
 
-	pos = pda_run->pda_tables->indicies[ind_pos];
+	pos = pda_run->pda_tables->indices[ind_pos];
 	if ( pos < 0 ) {
 		debug( prg, REALM_PARSE, "parse error, no transition 3\n" );
 		push_bt_point( prg, pda_run );
diff --git a/colm/pdarun.h b/colm/pdarun.h
index 5e5a9394..3cee2124 100644
--- a/colm/pdarun.h
+++ b/colm/pdarun.h
@@ -215,7 +215,7 @@ typedef struct _CaptureAttr
 struct pda_tables
 {
 	/* Parser table data. */
-	int *indicies;
+	int *indices;
 	int *owners;
 	int *keys;
 	unsigned int *offsets;
@@ -227,7 +227,7 @@ struct pda_tables
 	int *token_regions;
 	int *token_pre_regions;
 
-	int num_indicies;
+	int num_indices;
 	int num_keys;
 	int num_states;
 	int num_targs;
diff --git a/doc/ragel/ragel.1.in b/doc/ragel/ragel.1.in
index e9a6204c..9c768e85 100644
--- a/doc/ragel/ragel.1.in
+++ b/doc/ragel/ragel.1.in
@@ -158,7 +158,7 @@ The host language is JavaScript.
 (C/D/Java/Ruby/C#) Generate a table driven FSM. This is the default code style.
 The table driven
 FSM represents the state machine as static data. There are tables of states,
-transitions, indicies and actions. The current state is stored in a variable.
+transitions, indices and actions. The current state is stored in a variable.
 The execution is a loop that looks that given the current state and current
 character to process looks up the transition to take using a binary search,
 executes any actions and moves to the target state. In general, the table
diff --git a/ragel/ChangeLog b/ragel/ChangeLog
index e7fbc805..d095cab5 100644
--- a/ragel/ChangeLog
+++ b/ragel/ChangeLog
@@ -173,7 +173,7 @@ Ragel 6.2 - May 9, 2008
 =======================
  -Bug fix: The lm_switch actions needs to set p from tokend when there is no
   user action.
- -Bug fix: when not using indicies we can't use a transitions's id to identify
+ -Bug fix: when not using indices we can't use a transitions's id to identify
   the eof transition to take. Instead add the transition to the end of the
   transition list and store its position in a new var called pos. The pos var
   is then used as the index.
@@ -1065,7 +1065,7 @@ Ragel 3.6 - Jul 10, 2004
  -When resolving names, return a set of values so that a reference in an
   action block that is embedded more than once won't report distinct entry
   points that are actually the same.
- -Implemented flat tables. Stores a linear array of indicies into the
+ -Implemented flat tables. Stores a linear array of indices into the
   transition array and only a low and high key value. Faster than binary
   searching for keys but not usable for large alphabets.
  -Fixed bug in deleting of transitions leftover from converstion from bst to
@@ -1619,7 +1619,7 @@ Ragel 1.1.0 - Apr 15, 2002
  -Default operator (if two machines are side by side with no operator
   between them) is concatenation. First showed up in 1.0.4.
  -The fsm machine no longer auotmatically builds the flat table for
-  transition indicies. Instead it keeps the key,ptr pair. In tabcodegen
+  transition indices. Instead it keeps the key,ptr pair. In tabcodegen
   the flat table is produced. This way very large alphabets with sparse
   transitions will not consume large amounts of mem. This is also in prep
   for fsm graph getting a default transition.
@@ -1687,12 +1687,12 @@ Ragel 1.0.2 - Jan 30, 2002
   end.
  -If high/low index are at the limits, output a define in their place,
   not the high/low values themselves so as not to cause compiler warnings.
- -If the resulting machines don't have any indicies or functions, then
+ -If the resulting machines don't have any indices or functions, then
   omit the empty unrefereced static arrays so as not to cause compiler
   warnings about unused static vars.
- -Fixed variable sized indicies support. The header cannot have any
+ -Fixed variable sized indices support. The header cannot have any
   reference to INDEX_TYPE as that info is not known at the time the header
-  data is written. Forces us to use a void * for pointers to indicies. In
+  data is written. Forces us to use a void * for pointers to indices. In
   the c++ versions we are forced to make much of the data non-member
   static data in the code portion for the same reason.
 
diff --git a/ragel/asm.cc b/ragel/asm.cc
index 073f64dc..ca9f5d65 100644
--- a/ragel/asm.cc
+++ b/ragel/asm.cc
@@ -872,7 +872,7 @@ void AsmCodeGen::emitSingleIfElseIf( RedStateAp *state )
 	int numSingles = state->outSingle.length();
 	RedTransEl *data = state->outSingle.data;
 
-	/* Write out the single indicies. */
+	/* Write out the single indices. */
 	for ( int j = 0; j < numSingles; j++ ) {
 		out <<
 			"	cmpb	" << KEY( data[j].lowKey ) << ", %r10b\n"
diff --git a/ragel/asm.h b/ragel/asm.h
index a9f91e9a..6056e684 100644
--- a/ragel/asm.h
+++ b/ragel/asm.h
@@ -112,7 +112,7 @@ protected:
 	string C() { return "_" + DATA_PREFIX() + "cond_spaces"; }
 	string CK() { return "_" + DATA_PREFIX() + "cond_keys"; }
 	string K() { return "_" + DATA_PREFIX() + "trans_keys"; }
-	string I() { return "_" + DATA_PREFIX() + "indicies"; }
+	string I() { return "_" + DATA_PREFIX() + "indices"; }
 	string CO() { return "_" + DATA_PREFIX() + "cond_offsets"; }
 	string KO() { return "_" + DATA_PREFIX() + "key_offsets"; }
 	string IO() { return "_" + DATA_PREFIX() + "index_offsets"; }
diff --git a/ragel/binary.cc b/ragel/binary.cc
index 95aaa803..39b58a47 100644
--- a/ragel/binary.cc
+++ b/ragel/binary.cc
@@ -69,7 +69,7 @@ void Binary::tableDataPass()
 	taSingleLens();
 	taRangeLens();
 	taIndexOffsets();
-	taIndicies();
+	taIndices();
 
 	taTransCondSpacesWi();
 	taTransOffsetsWi();
@@ -352,25 +352,25 @@ void Binary::taKeys()
 	transKeys.finish();
 }
 
-void Binary::taIndicies()
+void Binary::taIndices()
 {
-	indicies.start();
+	indices.start();
 
 	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
 		/* Walk the singles. */
 		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ )
-			indicies.value( stel->value->id );
+			indices.value( stel->value->id );
 
 		/* Walk the ranges. */
 		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ )
-			indicies.value( rtel->value->id );
+			indices.value( rtel->value->id );
 
 		/* The state's default index goes next. */
 		if ( st->defTrans != 0 )
-			indicies.value( st->defTrans->id );
+			indices.value( st->defTrans->id );
 	}
 
-	indicies.finish();
+	indices.finish();
 }
 
 void Binary::taTransCondSpaces()
diff --git a/ragel/binary.h b/ragel/binary.h
index 8b9fc69a..d947483d 100644
--- a/ragel/binary.h
+++ b/ragel/binary.h
@@ -53,7 +53,7 @@ protected:
 
 	std::ostream &COND_KEYS_v1();
 	std::ostream &COND_SPACES_v1();
-	std::ostream &INDICIES();
+	std::ostream &INDICES();
 	std::ostream &INDEX_OFFSETS();
 	std::ostream &SINGLE_LENS();
 	std::ostream &RANGE_LENS();
@@ -64,7 +64,7 @@ protected:
 	void taSingleLens();
 	void taRangeLens();
 	void taIndexOffsets();
-	void taIndicies();
+	void taIndices();
 	void taTransCondSpacesWi();
 	void taTransOffsetsWi();
 	void taTransLengthsWi();
diff --git a/ragel/flat.cc b/ragel/flat.cc
index 24d7ef2c..8cda30db 100644
--- a/ragel/flat.cc
+++ b/ragel/flat.cc
@@ -65,7 +65,7 @@ void Flat::tableDataPass()
 	taCharClass();
 	taFlatIndexOffset();
 
-	taIndicies();
+	taIndices();
 	taIndexDefaults();
 	taTransCondSpaces();
 
@@ -99,7 +99,7 @@ void Flat::writeData()
 	taCharClass();
 	taFlatIndexOffset();
 
-	taIndicies();
+	taIndices();
 	taIndexDefaults();
 	taTransCondSpaces();
 	if ( red->condSpaceList.length() > 0 )
@@ -324,19 +324,19 @@ void Flat::taKeys()
 	transKeys.finish();
 }
 
-void Flat::taIndicies()
+void Flat::taIndices()
 {
-	indicies.start();
+	indices.start();
 
 	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
 		if ( st->transList != 0 ) {
 			long long span = st->high - st->low + 1;
 			for ( long long pos = 0; pos < span; pos++ )
-				indicies.value( st->transList[pos]->id );
+				indices.value( st->transList[pos]->id );
 		}
 	}
 
-	indicies.finish();
+	indices.finish();
 }
 
 void Flat::taIndexDefaults()
diff --git a/ragel/flat.h b/ragel/flat.h
index e13a7297..1e54f5ab 100644
--- a/ragel/flat.h
+++ b/ragel/flat.h
@@ -58,7 +58,7 @@ protected:
 	void taCharClass();
 	void taActions();
 	void taFlatIndexOffset();
-	void taIndicies();
+	void taIndices();
 	void taIndexDefaults();
 	void taTransCondSpaces();
 	void taTransOffsets();
@@ -76,7 +76,7 @@ protected:
 
 	void setKeyType();
 
-	std::ostream &INDICIES();
+	std::ostream &INDICES();
 	std::ostream &TRANS_COND_SPACES();
 	std::ostream &TRANS_OFFSETS();
 	std::ostream &TRANS_LENGTHS();
diff --git a/ragel/flatbreak.cc b/ragel/flatbreak.cc
index 9b50af1c..a3106cd2 100644
--- a/ragel/flatbreak.cc
+++ b/ragel/flatbreak.cc
@@ -37,7 +37,7 @@ void FlatBreak::LOCATE_TRANS()
 
 		out <<
 			"	" << keys << " = " << OFFSET( ARR_REF( transKeys ), "(" + vCS() + "<<1)" ) << ";\n"
-			"	" << inds << " = " << OFFSET( ARR_REF( indicies ),
+			"	" << inds << " = " << OFFSET( ARR_REF( indices ),
 					ARR_REF( flatIndexOffset ) + "[" + vCS() + "]" ) << ";\n"
 			"\n";
 
@@ -61,7 +61,7 @@ void FlatBreak::LOCATE_TRANS()
 							" - " << lowKey << "];\n"
 			"		if ( " << ic << " <= " << CAST("int") << DEREF( ARR_REF( transKeys ), string(keys) + "+1" ) << " && " <<
 						"" << ic << " >= " << CAST("int") << DEREF( ARR_REF( transKeys ), string(keys) + "" ) << " )\n"
-			"			" << trans << " = " << CAST(UINT()) << DEREF( ARR_REF( indicies ),
+			"			" << trans << " = " << CAST(UINT()) << DEREF( ARR_REF( indices ),
 								string(inds) + " + " + CAST("int") + "( " + string(ic) + " - " + CAST("int") +
 								DEREF( ARR_REF( transKeys ), string(keys) + "" ) + " ) " ) << "; \n"
 			"		else\n"
diff --git a/ragel/flatgoto.cc b/ragel/flatgoto.cc
index 2a0e9a21..3a05c002 100644
--- a/ragel/flatgoto.cc
+++ b/ragel/flatgoto.cc
@@ -37,7 +37,7 @@ void FlatGoto::LOCATE_TRANS()
 
 		out <<
 			"	" << keys << " = " << OFFSET( ARR_REF( transKeys ), "(" + vCS() + "<<1)" ) << ";\n"
-			"	" << inds << " = " << OFFSET( ARR_REF( indicies ),
+			"	" << inds << " = " << OFFSET( ARR_REF( indices ),
 					ARR_REF( flatIndexOffset ) + "[" + vCS() + "]" ) << ";\n"
 			"\n";
 
@@ -61,7 +61,7 @@ void FlatGoto::LOCATE_TRANS()
 							" - " << lowKey << "];\n"
 			"		if ( " << ic << " <= " << CAST("int") << DEREF( ARR_REF( transKeys ), string(keys) + "+1" ) << " && " <<
 						"" << ic << " >= " << CAST("int") << DEREF( ARR_REF( transKeys ), string(keys) + "" ) << " )\n"
-			"			" << trans << " = " << CAST(UINT()) << DEREF( ARR_REF( indicies ),
+			"			" << trans << " = " << CAST(UINT()) << DEREF( ARR_REF( indices ),
 								string(inds) + " + " + CAST("int") + "( " + string(ic) + " - " + CAST("int") +
 								DEREF( ARR_REF( transKeys ), string(keys) + "" ) + " ) " ) << "; \n"
 			"		else\n"
diff --git a/ragel/flatvar.cc b/ragel/flatvar.cc
index 37ea6be5..f7c5729a 100644
--- a/ragel/flatvar.cc
+++ b/ragel/flatvar.cc
@@ -40,7 +40,7 @@ void FlatVar::LOCATE_TRANS()
 
 		out <<
 			"	" << keys << " = " << OFFSET( ARR_REF( transKeys ), "(" + vCS() + "<<1)" ) << ";\n"
-			"	" << inds << " = " << OFFSET( ARR_REF( indicies ),
+			"	" << inds << " = " << OFFSET( ARR_REF( indices ),
 					ARR_REF( flatIndexOffset ) + "[" + vCS() + "]" ) << ";\n"
 			"\n";
 
@@ -64,7 +64,7 @@ void FlatVar::LOCATE_TRANS()
 							" - " << lowKey << "];\n"
 			"		if ( " << ic << " <= " << CAST("int") << DEREF( ARR_REF( transKeys ), string(keys) + "+1" ) << " && " <<
 						"" << ic << " >= " << CAST("int") << DEREF( ARR_REF( transKeys ), string(keys) + "" ) << " )\n"
-			"			" << trans << " = " << CAST(UINT()) << DEREF( ARR_REF( indicies ),
+			"			" << trans << " = " << CAST(UINT()) << DEREF( ARR_REF( indices ),
 								string(inds) + " + " + CAST("int") + "( " + string(ic) + " - " + CAST("int") +
 								DEREF( ARR_REF( transKeys ), string(keys) + "" ) + " ) " ) << "; \n"
 			"		else\n"
diff --git a/ragel/goto.cc b/ragel/goto.cc
index d3ca58f1..610f44d1 100644
--- a/ragel/goto.cc
+++ b/ragel/goto.cc
@@ -133,7 +133,7 @@ void Goto::SINGLE_SWITCH( RedStateAp *state )
 		/* Write out single keys in a switch if there is more than one. */
 		out << "switch( " << GET_KEY() << " ) {\n";
 
-		/* Write out the single indicies. */
+		/* Write out the single indices. */
 		for ( int j = 0; j < numSingles; j++ ) {
 			out << "case " << KEY(data[j].lowKey) << ": {\n";
 			TRANS_GOTO(data[j].value) << "\n";
diff --git a/ragel/gotoloop.cc b/ragel/gotoloop.cc
index dc536e6d..2434fd86 100644
--- a/ragel/gotoloop.cc
+++ b/ragel/gotoloop.cc
@@ -110,7 +110,7 @@ void GotoLoop::NFA_POP_TEST( RedNfaTarg *targ )
 
 std::ostream &GotoLoop::EXEC_FUNCS()
 {
-	/* Make labels that set acts and jump to execFuncs. Loop func indicies. */
+	/* Make labels that set acts and jump to execFuncs. Loop func indices. */
 	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) {
 		if ( redAct->numTransRefs > 0 ) {
 			out << "	f" << redAct->actListId << ": " <<
diff --git a/ragel/switch.cc b/ragel/switch.cc
index 8355cdac..076f3585 100644
--- a/ragel/switch.cc
+++ b/ragel/switch.cc
@@ -173,7 +173,7 @@ void Switch::SINGLE_SWITCH( RedStateAp *st )
 		/* Write out single keys in a switch if there is more than one. */
 		out << "\tswitch( " << GET_KEY() << " ) {\n";
 
-		/* Write out the single indicies. */
+		/* Write out the single indices. */
 		for ( int j = 0; j < numSingles; j++ ) {
 			out << CASE( KEY(data[j].lowKey) ) << " {\n";
 			TRANS_GOTO(transBase + j, data[j].value) << "\n";
@@ -286,7 +286,7 @@ void Switch::tableDataPass()
 	taSingleLens();
 	taRangeLens();
 	taIndexOffsets();
-	taIndicies();
+	taIndices();
 
 	taTransCondSpacesWi();
 	taTransOffsetsWi();
@@ -569,25 +569,25 @@ void Switch::taKeys()
 	transKeys.finish();
 }
 
-void Switch::taIndicies()
+void Switch::taIndices()
 {
-	indicies.start();
+	indices.start();
 
 	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
 		/* Walk the singles. */
 		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ )
-			indicies.value( stel->value->id );
+			indices.value( stel->value->id );
 
 		/* Walk the ranges. */
 		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ )
-			indicies.value( rtel->value->id );
+			indices.value( rtel->value->id );
 
 		/* The state's default index goes next. */
 		if ( st->defTrans != 0 )
-			indicies.value( st->defTrans->id );
+			indices.value( st->defTrans->id );
 	}
 
-	indicies.finish();
+	indices.finish();
 }
 
 void Switch::taTransCondSpaces()
diff --git a/ragel/switch.h b/ragel/switch.h
index 9af753df..7f23778b 100644
--- a/ragel/switch.h
+++ b/ragel/switch.h
@@ -61,7 +61,7 @@ protected:
 
 	std::ostream &COND_KEYS_v1();
 	std::ostream &COND_SPACES_v1();
-	std::ostream &INDICIES();
+	std::ostream &INDICES();
 	std::ostream &INDEX_OFFSETS();
 	std::ostream &SINGLE_LENS();
 	std::ostream &RANGE_LENS();
@@ -72,7 +72,7 @@ protected:
 	void taSingleLens();
 	void taRangeLens();
 	void taIndexOffsets();
-	void taIndicies();
+	void taIndices();
 	void taTransCondSpacesWi();
 	void taTransOffsetsWi();
 	void taTransLengthsWi();
diff --git a/ragel/tabbreak.cc b/ragel/tabbreak.cc
index 4c69138a..eb2f990b 100644
--- a/ragel/tabbreak.cc
+++ b/ragel/tabbreak.cc
@@ -204,7 +204,7 @@ void TabBreak::writeExec()
 	DECLARE( UINT(), cond, " = 0" );
 	DECLARE( INDEX( ALPH_TYPE() ), keys );
 	DECLARE( INDEX( ARR_TYPE( actions ) ), acts );
-	DECLARE( INDEX( ARR_TYPE( indicies ) ), inds );
+	DECLARE( INDEX( ARR_TYPE( indices ) ), inds );
 	DECLARE( UINT(), nacts );
 	DECLARE( INT(), have );
 	DECLARE( INT(), pop_test );
diff --git a/ragel/tabgoto.cc b/ragel/tabgoto.cc
index 7c74ab71..2813c469 100644
--- a/ragel/tabgoto.cc
+++ b/ragel/tabgoto.cc
@@ -175,7 +175,7 @@ void TabGoto::writeExec()
 	DECLARE( UINT(), cond, " = 0" );
 	DECLARE( INDEX( ALPH_TYPE() ), keys );
 	DECLARE( INDEX( ARR_TYPE( actions ) ), acts );
-	DECLARE( INDEX( ARR_TYPE( indicies ) ), inds );
+	DECLARE( INDEX( ARR_TYPE( indices ) ), inds );
 	DECLARE( UINT(), nacts );
 	DECLARE( INT(), pop_test );
 	DECLARE( INT(), new_recs );
diff --git a/ragel/tables.h b/ragel/tables.h
index 5799aacb..258f869e 100644
--- a/ragel/tables.h
+++ b/ragel/tables.h
@@ -66,7 +66,7 @@ struct Tables
 		transKeys(        "trans_keys",          *this ),
 		charClass(        "char_class",          *this ),
 		flatIndexOffset(  "index_offsets",       *this ),
-		indicies(         "indicies",            *this ),
+		indices(          "indices",             *this ),
 		indexDefaults(    "index_defaults",      *this ),
 		transCondSpaces(  "trans_cond_spaces",   *this ),
 		transOffsets(     "trans_offsets",       *this ),
@@ -123,7 +123,7 @@ struct Tables
 	TableArray transKeys;
 	TableArray charClass;
 	TableArray flatIndexOffset;
-	TableArray indicies;
+	TableArray indices;
 	TableArray indexDefaults;
 	TableArray transCondSpaces;
 	TableArray transOffsets;
diff --git a/ragel/tabvar.cc b/ragel/tabvar.cc
index 12f7fdf5..2f0ce112 100644
--- a/ragel/tabvar.cc
+++ b/ragel/tabvar.cc
@@ -145,7 +145,7 @@ void TabVar::writeExec()
 	DECLARE( UINT(), cond, " = 0" );
 	DECLARE( INDEX( ALPH_TYPE() ), keys );
 	DECLARE( INDEX( ARR_TYPE( actions ) ), acts );
-	DECLARE( INDEX( ARR_TYPE( indicies ) ), inds );
+	DECLARE( INDEX( ARR_TYPE( indices ) ), inds );
 	DECLARE( UINT(), nacts );
 	DECLARE( INT(), have );
 	DECLARE( INT(), pop_test );