Correct copyright information and consolidate it into COPYING

Author: ToxicFrog

COPYING

@@ -1,12 +1,12 @@
-Copyright © 2011 Ben "ToxicFrog" Kelly
+Copyright © 2011-2020 Rebecca "ToxicFrog" Kelly
 FP module copyright © 2008 Peter "Corsix" Cawley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions: 
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.

README.md

@@ -620,7 +620,7 @@ The converse of `writebits`. Each call to `bit()` returns the next bit, MSB firs
 
 ## 8. Credits ##
 
-While most of the library code was written by me (Ben Kelly), the existence of this library owes itself to many others.
+While most of the library code was written by me (Bex Kelly), the existence of this library owes itself to many others.
 
   * The original inspiration came from Roberto Ierusalimschy's "struct" library and Luiz Henrique de Figueiredo's "lpack" library, as well as the "struct" available in Python.
   * The floating point code was contributed by Peter Cawley ("corsix") on lua-l, as was support for Lua 5.2.

ast.lua

@@ -6,8 +6,6 @@
 -- See ast/*.lua for the implementations of various node types in the AST,
 -- and see lexer.lua for the implementation of the lexer.
 
--- Copyright (c) 2011 Ben "ToxicFrog" Kelly
-
 local vstruct = require "vstruct"
 local lexer  = require "vstruct.lexer"
 
@@ -28,11 +26,11 @@ end
 function ast.parse(source)
   local lex = lexer(source)
   local root = ast.List()
-  
+
   for node in (function() return ast.next(lex) end) do
     root:append(node)
   end
-  
+
   return ast.Root(root)
 end
 
@@ -55,7 +53,7 @@ end
 function ast.raw_io(lex)
   local name = lex.next().text
   local next = lex.peek()
-  
+
   if next and next.type == "number" and not lex.whitespace() then
     return ast.IO(name, lex.next().text)
   else
@@ -66,7 +64,7 @@ end
 function ast.key(lex)
   local name = lex.next().text
   local next = lex.peek()
-  
+
   if next.type == "io" then
     local io = ast.raw_io(lex)
     if not io.hasvalue then
@@ -82,35 +80,35 @@ end
 
 function ast.next(lex)
   local tok = lex.peek()
-  
+
   if tok.type == "EOF" then
     return nil
   end
-  
+
   if tok.type == '(' then
     return ast.group(lex)
-  
+
   elseif tok.type == '{' then
     return ast.table(lex)
-  
+
   elseif tok.type == '[' then
     return ast.bitpack(lex)
-    
+
   elseif tok.type == "io" then
     return ast.io(lex)
-  
+
   elseif tok.type == "key" then
     return ast.key(lex)
-    
+
   elseif tok.type == "number" then
     return ast.repetition(lex)
-    
+
   elseif tok.type == "control" then
     return ast.control(lex)
 
   elseif tok.type == "splice" then
     return ast.splice(lex)
-    
+
   else
     ast.error(lex, "'(', '{', '[', name, number, control, or io specifier")
   end
@@ -123,11 +121,11 @@ function ast.next_until(lex, type)
     if tok.type == 'EOF' then
       ast.error(lex, type)
     end
-    
+
     if tok.type == type then
       return nil
     end
-    
+
     return ast.next(lex)
   end
 end
@@ -152,14 +150,14 @@ end
 
 function ast.group(lex)
   ast.require(lex, '(')
-  
+
   local group = ast.List()
   group.tag = "group"
-  
+
   for next in ast.next_until(lex, ')') do
     group:append(next)
   end
-  
+
   ast.require(lex, ')')
   return group
 end
@@ -170,40 +168,40 @@ end
 
 function ast.raw_table(lex)
   ast.require(lex, '{')
-  
+
   local group = ast.Table()
-  
+
   for next in ast.next_until(lex, '}') do
     group:append(next)
   end
-  
+
   ast.require(lex, '}')
   return group
 end
 
 function ast.bitpack(lex)
   ast.require(lex, "[")
-  
+
   local bitpack = ast.Bitpack(tonumber(ast.require(lex, "number").text))
-  
+
   ast.require(lex, "|")
-  
+
   for next in ast.next_until(lex, ']') do
     bitpack:append(next)
   end
-  
+
   ast.require(lex, "]")
   bitpack:finalize()
   return bitpack
 end
 
 function ast.require(lex, type)
   local t = lex.next()
-  
+
   if t.type ~= type then
     ast.error(lex, type)
   end
-  
+
   return t
 end
 

cursor.lua

@@ -2,8 +2,6 @@
 -- exports: seek read write
 -- read only supports numeric amounts
 
--- Copyright (c) 2011 Ben "ToxicFrog" Kelly; see COPYING
-
 local cursor = {}
 
 -- like fseek

init.lua

@@ -1,7 +1,5 @@
 -- vstruct, the versatile struct library
 
--- Copyright (C) 2011 Ben "ToxicFrog" Kelly; see COPYING
-
 local vstruct = {}
 package.loaded.vstruct = vstruct
 

io.lua

@@ -6,8 +6,6 @@
 -- upon which it will attempt to load the handler for that operation from the
 -- module vstruct.io.<type> and call it.
 
--- Copyright (c) 2011 Ben "ToxicFrog" Kelly
-
 local defaults = require "vstruct.io.defaults"
 local mt = { __index = defaults }
 
@@ -19,8 +17,8 @@ local function iorequire(format)
   end
 
   setmetatable(v, mt)
-  
-  return v           
+
+  return v
 end
 
 local controlnames = {
@@ -38,8 +36,8 @@ end
 
 return function(format, method, ...)
   local fmt = iorequire(format)
-  
+
   assert(fmt[method], "No support for method '"..tostring(method).."' in IO module '"..format.."'")
-  
+
   return fmt[method](...)
 end

lexer.lua

@@ -2,8 +2,6 @@
 -- Returns a function which, given a source string, returns a table of lexer
 -- operations closed over that source.
 
--- Copyright (c) 2011 Ben "ToxicFrog" Kelly
-
 local lexis = {}
 
 local function lexeme(name)
@@ -32,7 +30,7 @@ return function(source)
   local orig = source
   local index = 1
   local hadwhitespace = false
-  
+
   local function where()
     return ("character %d ('%s')"):format(index, source:sub(1,4))
   end
@@ -50,7 +48,7 @@ return function(source)
     local function aux()
       if #source == 0 then return end
       local match,size = find_match()
-      
+
       if not match.name then
         hadwhitespace = true
         source = source:sub(size+1, -1)
@@ -65,7 +63,7 @@ return function(source)
   local function whitespace()
     return hadwhitespace
   end
-  
+
   local function next()
     eat_whitespace()
 

test/basic.lua

@@ -1,6 +1,7 @@
 -- "basic" test module for vstruct
--- does not test floating point operations - see test/fp-*endian.lua for those
--- Copyright (c) 2011 Ben "ToxicFrog" Kelly; see COPYING
+-- Tests a variety of non-floating-point usage.
+-- Does not test floating point operations - see test/fp-*endian.lua for those,
+-- since there are quite a lot of them.
 
 local vstruct = require "vstruct"
 local test = require "vstruct.test.common"

test/compat1x.lua

@@ -1,6 +1,4 @@
--- "basic" test module for vstruct
--- does not test floating point operations - see test/fp-*endian.lua for those
--- Copyright (c) 2011 Ben "ToxicFrog" Kelly; see COPYING
+-- Tests for format compability with vstruct 1.x
 
 local vstruct = require "vstruct"
 local test = require "vstruct.test.common"