Naming things

src/reader/common/text/data.ts → src/reader/common/text/token-field.ts

@@ -9,14 +9,13 @@ import { parseInt as fastParseInt, parseFloat as fastParseFloat } from './number
 import { Tokens } from './tokenizer'
 import ShortStringPool from '../../../utils/short-string-pool'
 
-export function createCategory(data: string, fields: string[], tokens: Tokens, rowCount: number) {
+export function createTokenFields(data: string, fields: string[], tokens: Tokens): { [name: string]: Data.Field } {
     const fi: TokenFieldInfo = { data, fieldCount: fields.length, tokens: tokens.indices };
-
     const categoryFields = Object.create(null);
     for (let i = 0; i < fi.fieldCount; ++i) {
         categoryFields[fields[i]] = TokenField(fi, i);
     }
-    return Data.Category(rowCount, categoryFields);
+    return categoryFields;
 }
 
 export interface TokenFieldInfo {

src/reader/gro/parser.ts

@@ -7,7 +7,7 @@
 
 import { State as TokenizerState, Tokens, eatLine, skipWhitespace, eatValue, trim } from '../common/text/tokenizer'
 import { parseInt } from '../common/text/number-parser'
-import { createCategory } from '../common/text/data'
+import { createTokenFields } from '../common/text/token-field'
 import * as Data from '../../data/data'
 import Result from '../result'
 
@@ -120,7 +120,7 @@ function handleAtoms(state: State) {
         eatLine(state)
     }
 
-    return createCategory(state.data, fields, tokens, state.info.numberOfAtoms);
+    return Data.Category(state.info.numberOfAtoms, createTokenFields(state.data, fields, tokens));
 }
 
 /**
@@ -151,7 +151,7 @@ function parseInternal(data: string): Result<Data.File> {
     handleBoxVectors(state, headerTokens);
 
     const block = Data.Block({
-        header: createCategory(data, headerFields, headerTokens, 1),
+        header: Data.Category(1, createTokenFields(data, headerFields, headerTokens)),
         atoms
     });
 

src/reader/spec/gro.spec.ts

@@ -5,7 +5,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import Gro from '../gro/index'
+import Gro from '../gro/format'
 
 const groString = `MD of 2 waters, t= 4.2
     6

src/script.ts

@@ -7,7 +7,7 @@
 // import * as util from 'util'
 import * as fs from 'fs'
 
-import Gro from './reader/gro/index'
+import Gro from './reader/gro/format'
 
 //const file = '1crn.gro'
 // const file = 'water.gro'