comments channel created

Author: jacobbogers

src/channel.ts

@@ -4,12 +4,13 @@ import { ISimpleToken, IRangeToken } from './IToken';
 import { IModule, IModuleEnums } from './module'
 import { IMatcher, IMatcherState } from './matchers'
 import { ITokenEmitter } from './tokenProducers'
+import { isComment, isContinue } from './helpers'
 
 const printer = debug('IChannel')
 
 export interface IChannel<T extends ISimpleToken> {
     mod: IModule;
-    name: string; 
+    name: string;
     tokens: T[];
     process();
 }
@@ -34,7 +35,7 @@ export function createChannel<T extends ISimpleToken>(name: string) {
                         printer(`module [${module.name}] loaded an empty file`)
                         return
                     }
-                    this.tokens =[] //clear
+                    this.tokens = [] //clear
                     for (let i = 0; i < raw.length; i++) {
                         te.forEach(fn => {
                             const token = fn(raw[i], i)
@@ -51,21 +52,64 @@ export function createChannel<T extends ISimpleToken>(name: string) {
     }
 }
 
-export function createVirtualEOLChannel<T extends ISimpleToken>(name: string, ch: IChannel<T>) : IChannel<T> {
-   
-    if (ch.name !== 'lf'){
-        throw new TypeError(`channel not the "lf" channel`)
-    }
-    if (ch !== ch.mod.channels.get('lf')){
+export function createLogicalEOLChannel<T extends ISimpleToken>(ch: IChannel<T>): IChannel<T> {
+
+    if (ch !== ch.mod.channels.get('lf')) {
         throw new TypeError(`source "lf" channel is not registered with a module`)
     }
-    const vCh:IChannel<T> = {
+    const vCh: IChannel<T> = {
         mod: ch.mod,
-        tokens:[], //vtokens
-        name,
-        process(){
-            
+        tokens: [], //vtokens
+        name: 'vlf',
+        process() {
+            const tokens = this.tokens = []
+            let prev = 0
+            for (let i = 0; i < ch.tokens.length; i++) {
+                const pos = ch.tokens[i].f
+                const line = ch.mod.raw.slice(prev, pos)
+                prev = pos + 1
+                if (isContinue(line)) {
+                    if (tokens.length === 0) {
+                        const err = `first line cannot be continuation: [${line}]`
+                        printer(err)
+                        throw new Error(err)
+                    }
+                    tokens[tokens.length - 1] = ch.tokens[i]
+                    continue
+                }
+                tokens.push(ch.tokens[i])
+            }
         }
     }
+    ch.mod.channels.set(vCh.name, vCh)
     return vCh
+}
+
+export function createCommentsChannel<T extends ISimpleToken>(ch: IChannel<T>): IChannel<T> {
+
+    if (ch !== ch.mod.channels.get('vlf') && ch !== ch.mod.channels.get('lf')) {
+        throw new TypeError(`source "lf/vlf" channel is not registered with a module`)
+    }
+    const comm: IChannel<T> = {
+        mod: ch.mod,
+        tokens: [], //vtokens
+        name: 'comments',
+        process() {
+            const tokens = this.tokens = []
+            let prev = 0
+            for (let i = 0; i < ch.tokens.length; i++) {
+                const pos = ch.tokens[i].f
+                const line = ch.mod.raw.slice(prev, pos)
+
+                if (isComment(line)) {
+                    tokens.push({ f: prev, t: pos })
+
+                }
+                prev = pos + 1
+
+            }
+        }
+    }
+    ch.mod.channels.set(comm.name, comm)
+    return comm
 }

src/helpers.ts

@@ -3,3 +3,7 @@ export const isString = s => typeof s === 'string'
 export const cc = '\u0020'
 export const _ = undefined
 
+export const isComment = c => '*cC'.includes(c[0])
+export const isContinue = function (c: string) {
+    return c.startsWith('    ') && c[5] !== ' '
+}

src/index.ts

@@ -2,7 +2,7 @@ import { createModule } from './module'
 import { createClassMatcher, createLiteralMatcher } from './matchers'
 import { simpleProducer, rangeProducer, createTokenEmitter }  from './tokenProducers'
 import { lf, ws } from './classes'
-import { createChannel } from './channel'
+import { createChannel, createLogicalEOLChannel, createCommentsChannel } from './channel'
 import { aLoad } from './fsutils'
 
 export {
@@ -14,7 +14,9 @@ export {
     createChannel,
     lf,
     ws,
-    createModule
+    createModule,
+    createLogicalEOLChannel,
+    createCommentsChannel
 }
 
 export default {
@@ -26,6 +28,8 @@ export default {
     createChannel,
     lf,
     ws,
-    createModule
+    createModule,
+    createLogicalEOLChannel,
+    createCommentsChannel
 }
 

test.js

@@ -9,7 +9,9 @@ const {
     simpleProducer, rangeProducer,
     createTokenEmitter,
     createChannel,
-    aLoad
+    aLoad,
+    createLogicalEOLChannel,
+    createCommentsChannel
 } = f77
 
 const mod77 = f77.createModule(resolve('test/dhgeqz.f'))
@@ -26,17 +28,15 @@ const wsChannel = createChannel( 'ws' )( wsEmitter )( mod77 )
 mod77.load().then(mod=>{
     lfChannel.process()
     wsChannel.process()
-    channel = mod.channels.get('lf')
-    const hist = new Map()
-    channel.tokens.reduce( (map, v, i, arr) => {
-        const delta =  (v.t && ( v.t - v.f + 1 )) || 1
-        let len = map.get(delta) || 0
-        len += delta
-        map.set(delta, len)
-        return map
-    }, hist)
-    const e = Array.from(hist.entries()).sort((a,b)=>a[0]-b[0])
-    e.forEach(eb=>console.log('\n>',eb[0],eb[1]))
+    const vlfChannel = createLogicalEOLChannel(lfChannel)
+    vlfChannel.process()
+    const commChannel = createCommentsChannel(vlfChannel)
+    commChannel.process()
+    //channel = mod.channels.get('lf')
+    commChannel.tokens.forEach((v, i, arr) => {
+        console.log(`${`${i}`.padStart(4,0)}: ${commChannel.mod.raw.slice(v.f,v.t)}`)
+    })
+    
 })
 
 

test/dhgeqz.f

@@ -1207,7 +1207,7 @@ SUBROUTINE DHGEQZ( JOB, COMPQ, COMPZ, N, ILO, IHI, H, LDH, T, LDT,
                IF( ABS( W22 ).LT.ABS( U2 ) )
      $            SCALE = ABS( W22 / U2 )
                IF( ABS( W11 ).LT.ABS( U1 ) )
-     $            SCALE = MIN( SCALE, ABS( W11 / U1 ) )
+12345$            SCALE = MIN( SCALE, ABS( W11 / U1 ) )
 *
 *              Solve
 *