tallakt-plcutil 0.2.6 → 0.2.7

data/lib/plcutil/siemens/awl/awl.treetop

@@ -12,6 +12,9 @@ module PlcUtil
       rule db
         'DATA_BLOCK ' name eol
         title
+        author?
+        family?
+        block_name?
         'VERSION : ' version eol
         eol*
         root_struct_decl
@@ -23,6 +26,9 @@ module PlcUtil
 
       rule udt
         'TYPE ' name eol
+        author?
+        family?
+        block_name?
         'VERSION : ' version eol
         eol*
         root_struct_decl
@@ -33,6 +39,9 @@ module PlcUtil
       rule ob
         'ORGANIZATION_BLOCK ' name eol
         title
+        author?
+        family?
+        block_name?
         'VERSION : ' version eol
         eol*
         (!ob_end .)*
@@ -68,6 +77,18 @@ module PlcUtil
         'TITLE =' optional_title:(ws title_quoted:(quoted_string))? eol
       end
 
+      rule author
+        'AUTHOR : ' (!eol .)* eol
+      end
+
+      rule family
+        'FAMILY : ' (!eol .)* eol
+      end
+
+      rule block_name
+        'NAME : ' (!eol .)* eol
+      end
+
       rule ob_end
         'END_ORGANIZATION_BLOCK'
       end
@@ -93,7 +114,7 @@ module PlcUtil
       end
 
       rule initial_value
-        ':=' ws single_quoted_string
+        ':=' ws (single_quoted_string / float)
       end
 
       rule array_declaration
@@ -110,7 +131,7 @@ module PlcUtil
       end
 
       rule struct_data_type
-        'STRUCT' ws? eol
+        'STRUCT' ws? struct_comment:(line_comment?) eol
         decl:declaration* 
         ws 'END_STRUCT'
       end
@@ -152,6 +173,10 @@ module PlcUtil
         (single_quoted_string / (!(ws / ';') .)+)
       end
 
+      rule float
+        [0-9]+ "." [0-9]+ "e+" [0-9]+
+      end
+
       rule eol
         "\r"? "\n"
       end

data/lib/plcutil/siemens/awl/awl_file.rb

@@ -16,7 +16,7 @@ module PlcUtil
       attr_reader :symlist
 
       def initialize(filename, options = {})
-        @symlist = options[:symlist] && SymlistFile.new(options[:symlist])
+        @symlist = options[:symlist] && SymlistFile.new(options[:symlist]) || {}
         # parse file
         parser = PlcUtil::Awl::AwlGrammarParser.new
         awl_nodes = parser.parse File.read(filename)
@@ -24,7 +24,7 @@ module PlcUtil
         if !@awl
           raise [
             "Unable to parse file: #{filename}",
-            "Failure on line #{parser.failure_line} column #{parser.failure.column}",
+            "Failure on line #{parser.failure_line} column #{parser.failure_column}",
             "Details:",
             parser.failure_reason.inspect,
           ].join("\n")

data/lib/plcutil.rb

@@ -3,6 +3,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module PlcUtil
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tallakt-plcutil
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors: