rubimc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4465934e351aae8519533e572a4db1f636230a2d
-  data.tar.gz: 20b82528892f27d9c7dc428b3c744d973da93dce
+  metadata.gz: b52fe6847b85209bb0018b7afd0ebc6fcc92d0cc
+  data.tar.gz: 88e2ebaee4e861f2764b21f1458508c63894a443
 SHA512:
-  metadata.gz: 6c9694603cc3dcd38c5a82df186c89573f586a0560b414f991771f4f7b638522b382e414b58febe950a210633c90e3a3ac5c43dd2e756997f0cbfc211a746b2a
-  data.tar.gz: 8bdf46becb20231885f57e47de38d0a8b5c347bb23dc5a1ae4f3788de98116894fb921d6ed89d5faedaaad508b8705e52a61cfba426fde5fb62e4ad8229528ed
+  metadata.gz: 3d5e74dc243f0c55e0ea8aa6d876df15336c5027c52df64db64ee03d52a084dc6ea3d46c499b3e6b9a7ffcdf95d9940fd92250d24cca9b93bb9a7cbb600e54e2
+  data.tar.gz: 3346556ddb1be68a8da416132fbf137bbacf4db50bb846ac90b77419cec5fd52601db71498fc153628b5b2b2aa0bdb73000897b60ac980068131f994a82ef636

data/README.md

@@ -38,22 +38,23 @@ To install *avr-gcc* use this [manual] (http://avr-eclipse.sourceforge.net/wiki/
 
 
 ### ToDo list (main of them):
-0. upload to rubygems
-0. Test core with command "rubimc test"
+1. Validate code before preprocessing
+1. Support C-libraries
 1. Code generator:
     + define user`s variables as local (now it defined in top-level instance)
     + support all C types of variables (int ,float, unsigned int, u_int8 e.t.)
-    + support array, hash, string, range and constants
+    + check match types (in assign and operations) and try to cast
+    + support array, hash, string, range and constants (as full as possible)
     + support user`s methods and classes
     + support threads
 2. Write libraries for microcontrollers (AVR, PIC, STM, e.t.)
 3. Fix a lot of possible bugs & features
 
-### What is done
-1. Init variables
-2. Support all arithmetic operation except ternary and logical operators (binary operators is done)
-3. Support conditions (if/unless and it`s modify version) and loops (while/until) except next/redo/break/retry keywords
-4. Support arrays init and arithmetic operation with it
+### What is done now
+1. Initialize variables (supported types: bool,int,float,double)
+2. Support most of ruby operators: arithmetic, unary, comparison, binary (need to realize logical operators: and/or/not)
+3. Support conditions if/unless (with return values) and it modify version
+4. Suppotr loops while/until and it modify version (except redo/retry instruction)
 5. Realize example library for AVR AtTiny13 MCU with DigitalIO and ADC support
 
 ### Example for AVR microcontroller:
@@ -124,7 +125,7 @@ ISR(ADC_vect)
 ### Some rake helpers
 For create new project RubimC gem support command "generate" (of just "g"). For example:
 ```sh
-rubimc generate mcu "BrainControll.rb" type:attiny13 # create template "BrainControll.rb" for AVR microcontroller 'attiny13'
+rubimc generate mcu BrainControll type:attiny13 # create template "BrainControll.rb" for AVR microcontroller 'attiny13'
 rubimc g mcu FirstProg # create template "FirstProg.rb" for unknown microcontroller
 rubimc g clearC Example # create template "Example.rb" for generate clear C code
 ```
@@ -135,8 +136,7 @@ There is interesting idea for connect few microconrollers (IC) via some firmware
 ```ruby
 class BrainController < AVR_atmega16
     def initialize()
-        input :button, port: :A, pin: 6 
-        # its a syntax surag of "@button = input name: 'button', port: 'A', pin: 6"
+        input :@button, port: :A, pin: 6 
     end
 
     def main_loop() # infinit loop, it stop only when IC is reset
@@ -162,7 +162,7 @@ class LeftHandController < AVR_attiny13
     end
 
     def initialize()
-        output :led, port: :B, pin: 3
+        output :@led, port: :B, pin: 3
     end
 
     def main_loop() # infinit loop, it stop only when IC is reset

data/bin/rubimc

@@ -114,7 +114,7 @@ elsif exec_type == 'compile'
 		end
 
 		# === check syntax of user program ===
-		print "Check syntax..."
+		print "  Check syntax..."
 		sh "ruby -c '#{input_file}'", verbose: false do |ok, res|
 			exit 1 unless ok # check exit status after command runs
 		end
@@ -134,9 +134,10 @@ elsif exec_type == 'compile'
 		Dir.mkdir("#{release_folder}/") unless Dir.exists?("#{release_folder}/")
 
 		# === preprocessing user`s program ===
-		print "preprocessing file \"#{basename}.rb\"..."
+		print "  preprocessing file \"#{basename}.rb\"..."
 		require 'rubimc/preprocessor'
 		PreProcessor.write_in_file(input_file, dirname, basename, "#{outfile}.rb")
+		print "done\n"
 
 		# === check type: gcc/avr-gcc
 		require "#{outfile}.rb"
@@ -150,7 +151,7 @@ elsif exec_type == 'compile'
 		mcu_type = RubimCode::Printer.mcu_type
 
 		# === execute preprocessing program, generate C code ===
-		puts "generate C code"
+		puts "  generate C code"
 		sh "ruby '#{outfile}.rb' '#{outfile}'.c", verbose: false do |ok, res|
 			exit 1 unless ok # check exit status after command runs
 		end
@@ -159,7 +160,7 @@ elsif exec_type == 'compile'
 		# === compile C code to object-code and link to hex/exe ===
 		# ToDo: add DF_CPU (is it need?)
 		if code_type == "avr-gcc"
-			print "compile and link..."
+			print "  compile and link..."
 			sh "avr-gcc -std=c99 -Os -mmcu=#{mcu_type} -c '#{outfile}.c' -o '#{outfile}.o'", verbose: false do |ok, res|
 				exit 1 unless ok # check exit status after command runs
 			end
@@ -170,7 +171,7 @@ elsif exec_type == 'compile'
 			puts "done"
 
 		elsif code_type == "gcc"
-			print "compile and link..."
+			print "  compile and link..."
 			sh "gcc  -std=c99 -o '#{outfile}.out' '#{outfile}.c'", verbose: false do |ok, res|
 				exit 1 unless ok # check exit status after command runs
 			end
@@ -183,6 +184,14 @@ elsif exec_type == 'compile'
 		end
 	end
 
+# Development mode
+elsif exec_type == "dev_compile"
+	require "#{gem_dir}/lib/version.rb"
+	puts "development mode"
+	sh "gem build rubimc.gemspec"
+	sh "gem install rubimc-#{RubimCode::VERSION}.gem"
+	sh "rubimc compile #{ARGV[1]}"
+
 else
 	puts "ERROR: unknown command for rubimc"
 	puts "Available commands: compile; generate;"

data/lib/rubimc.rb

@@ -31,22 +31,41 @@ class RubimCode
 		end
 
 		def to_i
-			@name.to_i
+			self.name.to_i
+		end
+
+		def to_bool
+			return true   if self.name == true   || self.name =~ (/(true|t|yes|y|1)$/i)
+			return false  if self.name == false  || self.name.blank? || self.name =~ (/(false|f|no|n|0)$/i)
+			RubimCode.perror "Can not convert variable #{self} to boolean"
 		end
 
 		def to_rubim
 			self
 		end
 
-		def c_assign=(val) 
-			RubimCode.pout "#{@name} = #{val};"
+		def c_assign=(val)
+			RubimCode::Isolator.permit!(self)
+			RubimCode::Isolator.permit!(val)
+
+			RubimCode.perror "Undefined variable or method" if val.nil?
+			RubimCode.perror "Wrong match types" unless val.is_a? UserVariable
+
+			RubimCode.pout "#{self.name} = #{val};"
 		end
 
-		def common_operator(val, operator_sym)
+		def common_operator(val, operator_sym, **options)
 			if not val.class.respond_to? :to_s
 				RubimCode.perror "Conversion of variable #{val} is impossible. Method 'to_s' not found"
 			else 
-				UserVariable.new(self.name + operator_sym.to_s + val.to_s)
+				if options[:unary]
+					RubimCode::Isolator.permit!(self)
+					UserVariable.new(operator_sym.to_s[0] + self.name, 'expression')
+				else
+					RubimCode::Isolator.permit!(self)
+					RubimCode::Isolator.permit!(val)
+					UserVariable.new(self.name + operator_sym.to_s + val.to_s, 'expression')
+				end
 			end
 		end
 
@@ -62,18 +81,18 @@ class RubimCode
 		# ToDo: (can not override; use preprocessor)
 
 		# Unary Operators:
-		def -@; UserVariable.new("(-" + self.name + ")"); end
-		def +@; UserVariable.new("(+" + self.name + ")"); end
-		def !@; UserVariable.new("(+" + self.name + ")"); end
-		def ~@; UserVariable.new("(+" + self.name + ")"); end
+		def -@; common_operator(nil, __method__, unary: true); end
+		def +@; common_operator(nil, __method__, unary: true); end
+		def !@; common_operator(nil, __method__, unary: true); end
+		def ~@; common_operator(nil, __method__, unary: true); end
 
 		# Comparison Operators:
-		def ==(val);	common_operator(val, __method__); end
-		def !=(val);	common_operator(val, __method__); end
-		def  <(val);	common_operator(val, __method__); end
-		def  >(val);	common_operator(val, __method__); end
-		def <=(val);	common_operator(val, __method__); end
-		def >=(val);	common_operator(val, __method__); end
+		def ==(val); common_operator(val, __method__); end
+		def !=(val); common_operator(val, __method__); end
+		def  <(val); common_operator(val, __method__); end
+		def  >(val); common_operator(val, __method__); end
+		def <=(val); common_operator(val, __method__); end
+		def >=(val); common_operator(val, __method__); end
 
 		# Binary Operators:
 		def &(val); common_operator(val, __method__); end
@@ -88,8 +107,9 @@ class RubimCode
 		# Ternary Operators: (? :)
 		# ToDo...
 
-		# Ruby Parallel Assignment:
-		# a, b, c = 10, 20, 30 # ToDo
+		# Ruby Parallel Assignment :
+		# a, b, c = 10, 20, 30 
+		# ToDo: use preprocessor: => [a, b, c].c_assing= 10, 20, 30
 
 		# ToDo: операторы, которым нет аналогов в Си
 		# def <=>(val);	??? end
@@ -110,7 +130,8 @@ class RubimCode
 		end
 
 		# ToDo: add mixins Enumerable and Comparable
-	end
+
+	end # end UserVariable class
 
 	# ToDo: в Ruby присваивание значений индексной переменной 
 	# не должно влиять на выполнение цикла
@@ -126,7 +147,7 @@ class RubimCode
 		def to_s
 			self.name
 		end
-	end
+	end # end LoopCounter class
 
 	class UserArray < Array
 		attr_accessor :name, :type
@@ -148,7 +169,7 @@ class RubimCode
 			RubimCode.level -=1
 			RubimCode.pout "}"
 		end
-	end
+	end # end UserArray class
 
 	# Наследник всех пользовательских классов
 	class UserClass < UserVariable
@@ -194,7 +215,7 @@ class RubimCode
 			end
 		end
 
-	end
+	end # end UserClass class
 
 	# Список аппаратных прерываний (содержит Си-код в текстовом виде)
 	class Interrupts
@@ -217,7 +238,37 @@ class RubimCode
 				RubimCode.pout interrupt_code
 				end
 		end
-	end
+	end # end Interrupts class
+
+	class Isolator
+		class << self
+			attr_accessor :outside_binding
+			attr_accessor :local_variables
+			attr_accessor :enabled
+		end
+
+		def self.permit!(var)
+			return unless self.enabled
+			return unless self.outside_binding
+			return unless var.is_a? UserVariable
+			return if var.type.in? ["fixed", "expression", "undefined", nil]
+			return if var.type === /^tmp/
+
+			if !local_variables.include?(var.name) and 
+				outside_binding.local_variable_defined?(var.name.to_sym)
+					RubimCode.perror "Undefined variable '#{var.name}'. To pass params in interruprts use instance variables: '@#{var.name}'"
+			end
+		end
+
+		def self.run
+	        self.local_variables = []
+			self.enabled = true
+		end
+
+		def self.stop
+			self.enabled = false
+		end
+	end # end Isolator class
 
 	class CC_ARGS # class for arguments when work with clear C-code
 		def count
@@ -227,7 +278,7 @@ class RubimCode
 		def [](index)
 			RubimCode::UserVariable.new("argv[#{index}]", "int")
 		end
-	end
+	end # end CC_ARGS class
 
 end 
 # === END class RubimCode === #

data/lib/rubimc/control_structures.rb

@@ -3,6 +3,7 @@ class << self
 
 	@@rubim_defined_values = []
 
+	# instructions "if" & "unless"
 	def rubim_cond(cond, type="if", &block)
 		# ToDo: auto-define type of ret_value
 		# use::  __rubim__rval__int, __rubim__rval__float, e.t.
@@ -24,9 +25,10 @@ class << self
 		pout "__rubim__rval#{@level-1} = #{ret_val};" if ret_val!="__rubim__noreturn"
 		pout "}"
 		@level -= 1
-		return "__rubim__rval#{@level}"
+		return RubimCode::UserVariable.new("__rubim__rval#{@level}", 'tmp_int')
 	end
 
+	# instructions "while" & "until"
 	def rubim_cycle(type="while", cond="true", &block)
 		pout "#{type} (#{cond}) {"
 		@level+=1
@@ -35,24 +37,29 @@ class << self
 		@level-=1
 	end
 
+	# flat instructions
 	def rubim_if(cond, &block); rubim_cond(cond, "if", &block); end
 	def rubim_unless(cond, &block); rubim_cond(cond, "unless", &block); end
 	def rubim_while(cond, &block); rubim_cycle("while", cond, &block); end
 	def rubim_until(cond); rubim_cycle("until", cond, &block); end
 	def rubim_loop(&block); rubim_cycle("while", "true", &block); end
 
+	# modify instructions
+	def rubim_ifmod(cond); pout "if (#{cond}) {"; @level+=1; true; end
+	def rubim_unlessmod(cond); pout "if (!(#{cond})) {"; @level+=1; true; end
 	def rubim_whilemod(cond); pout "} while (#{cond});"; @level-=1; end
 	def rubim_untilmod(cond); pout "} until (#{cond});"; @level-=1; end
 
-	def rubim_ifmod(cond); pout "if (#{cond}) {"; @level+=1; true; end
-	def rubim_unlessmod(cond); pout "if (!(#{cond})) {"; @level+=1; true; end
 	def rubim_begin(); pout "{"; @level+=1; true; end
 	def rubim_end(); pout "}"; @level-=1; "__rubim__noreturn"; end
 	def rubim_tmpif(tmp); end
 
 	def rubim_else(); @level-=1; pout "} else {"; @level+=1; end
 	def rubim_elsif(cond); @level-=1; pout "} else if (#{cond}) {"; @level+=1; end
-	# ToDo: set return_val, like in rubim_if (need to change preprocessor)
+	# ToDo: in 'else' and 'elsif' set return_val, like in rubim_if (need to change preprocessor)
+
+	def rubim_next; pout "continue;" end
+	def rubim_break; pout "break;" end
 
 end # class << self
 end # RubimCode class

data/lib/rubimc/controllers.rb

@@ -1,4 +1,4 @@
-# ToDo: replace Controllers to MCUs
+# ToDo: rename Controllers to MCUs
 class Controllers
 	def self.all # list of USER`s microcontrolles
 		@@controllers_array
@@ -13,30 +13,6 @@ class Controllers
 		false
 	end
 
-	def self.print_cc_layout(position)
-		if position == :before_main
-			RubimCode.pout "/**************************************************************"
-			RubimCode.pout " * This code was generated by RubimC micro-framework"
-			RubimCode.pout " * RubimC version: #{RubimCode::VERSION}"
-			RubimCode.pout " * Author: Evgeny Danilov"
-			RubimCode.pout " * File created at #{Time.now}"
-			RubimCode.pout " **************************************************************/"
-			RubimCode.pout
-			RubimCode.pout "#include <stdbool.h>"
-			RubimCode.pout "#include <stdio.h>"
-			RubimCode.pout
-			yield if block_given?
-			RubimCode.pout
-			RubimCode.pout "int main(int argc, char *argv[]) {"
-			RubimCode.level += 1
-		else
-			RubimCode.pout
-			RubimCode.pout "return 1;"
-			RubimCode.level -= 1
-			RubimCode.pout "}"
-		end
-	end
-
 	def self.find_mcu(name)
 		series_array = Controllers.descendants
 		real_mcu_array = []

data/lib/rubimc/init_var.rb

@@ -2,75 +2,80 @@
 # Initialize user`s variables										#
 #####################################################################
 
-class << RubimCode
-	attr_accessor :binding
-end
-
-def integer(*varies) # varies - набор инициализируемых переменных
-	str_cc = "int "
-	ret_var = []
+# type_cc - тип переменной в С-программе
+# variables - набор инициализируемых переменных
+def RubimCode.init_vars(type_cc, *variables) 
+	vars_cc = ""
+	rubim_vars = []
 
-	varies.each {|var|
+	variables.each {|var|
 		# ToDo - поиск уже объявленных переменных и выдача предупреждений
 
 		if var.is_a? Hash # ToDo
-			RubimCode.perror "Ошибка. В бета-версии нельзя назначать переменным значения при объявлении"
+			RubimCode.perror "Ошибка. В текущей версии нельзя назначать переменным значения при объявлении"
 			# key = var.keys.first
 			# instance_variable_set("@#{key.to_s}" , UserVariable.new("#{key.to_s}"))
-			# str_cc += "#{key.to_s}=#{var[key]}, "
-		else
-			if var.to_s[0] == '@'
-				# ToDo:
-				RubimCode.perror "ToDo:"
-			elsif var.to_s[0] == '$'
-				# ToDo or delete
-				RubimCode.perror "Ошибка. В текущей версии нельзя инициализировать глобальные переменные"
-			else
-				str_cc += "#{var}, "
-				ret_var << RubimCode::UserVariable.new("#{var}", 'int')
-			end
-
-			# if self.ancestors.include? RubimCode or self == TestController
+			# vars_cc += "#{key.to_s}=#{var[key]}, "
 
-				# str_cc = "int " if str_cc.nil?
-				# str_cc += "#{var}, "
+		elsif var.is_a? Symbol
+			var_str = var.to_s
+			var_name = var_str.gsub(/^[@$]/, "")
+			new_var = RubimCode::UserVariable.new("#{var_name}", type_cc)
+			rubim_vars << new_var
 
-				# eval ("
-				# 	def #{var}
-				# 		@users__var__#{var}
-				# 	end
-				# 	@users__var__#{var} = RubimCode::UserVariable.new(\"#{var}\", 'int')
-				# 	")
-
-				# # Альтернативная реализация
-				# var_method = Proc.new {instance_variable_get("@users__var__#{var}")}
-				# self.class.send(:define_method, var.to_sym, var_method)
-				# instance_variable_set("@users__var__#{var}" , UserVariable.new("#{var}", 'int'))
-			# else
-			# 	add_var_array(self.name, UserVariable.new("#{var}", 'int'))
-			# 	eval ("
-			# 			def #{var}=(value)
-			# 				pout \"\#{self.name}.#{var} = \#{value};\"
-			# 			end
-			# 			def #{var}
-			# 				UserVariable.new(\"\#{self.name}.#{var}\", 'int')
-			# 			end
-			# 			")
-			# end
+			case var_str[0..1]
+				when /$./ # define GLOBAL variable 
+					RubimCode.perror "Ruby-like global variables are not supported yet. Use 'integer :@#{var_name}'"
+				when /@@/ # define CLASS variable 
+					RubimCode.perror "Ruby-like class variables are not supported yet. Use 'integer :@#{var_name}'"
+				when /@./ # define INSTANCE variable (in C it defined as global - outside the 'main' function)
+					RubimCode::Printer.instance_vars_cc << new_var
+				else 	  # define LOCAL variable (in C it defined as local)
+					RubimCode::Isolator.local_variables << var_name if RubimCode::Isolator.enabled
+					vars_cc += "#{var_name}, "
+			end
+			
+		else
+			RubimCode.perror "Unknown type of parameters for helper #{__method__}"
 		end
 	}
-	if ret_var.empty?
-		RubimCode.perror "no variables to init" 
+	if rubim_vars.empty?
+		RubimCode.perror "No variables for initialize"
+	end
+	unless vars_cc.empty?
+		vars_cc.chomp!(", ")
+		RubimCode.pout ("#{type_cc} #{vars_cc};")
 	end
-	RubimCode.pout ("#{str_cc.chomp(', ')};")
 
-	if ret_var.count == 1
-		return ret_var[0]
+	if rubim_vars.count == 1
+		return rubim_vars[0]
 	else
-		return ret_var
+		return rubim_vars
 	end
 end
 
+def boolean(*variables)
+	RubimCode.init_vars("bool", *variables)
+end
+alias :bool :boolean
+
+def integer(*variables)
+	RubimCode.init_vars("int", *variables)
+end
+alias :int :integer
+
+def float(*variables)
+	RubimCode.init_vars("float", *variables)
+end
+
+def double(*variables)
+	RubimCode.init_vars("double", *variables)
+end
+###############################################################################
+# NOTE! When add NEW TYPES, modify preprocessor: method 'add_binding_to_init' #
+###############################################################################
+
+
 def array_of_integer(var, size: nil)
 	array(var, with: {type: :integer, size: size})
 end
@@ -85,6 +90,7 @@ def array(var, with: {type: 'UserVariable', size: nil})
 
 	user_class = with[:type]
 	with[:type] = 'int' if with[:type] == 'integer'
+	with[:type] = 'bool' if with[:type] == 'boolean'
 	if (with[:type].in? ['bool','int','float','double','string']) 
 		user_class = "UserVariable"
 	end

data/lib/rubimc/io_ports.rb

@@ -1,23 +1,21 @@
-def output (var, port: nil, pin: nil, type: "normal")
+def RubimCode.init_io(mcu_class, rb_type, var, port: nil, pin: nil, type: "normal")
 	if port.nil? or pin.nil?
 		RubimCode.perror "Необходимо указать порт и пин для выхода #{var}"
-	elsif not self.class::PORTS.include? port
-		RubimCode.perror "У микроконтроллера #{self.class::MCU_NAME} нет порта #{port}"
-	elsif not self.class::PORTS[port].include? pin.to_i
-		RubimCode.perror "У микроконтроллера #{self.class::MCU_NAME} нет порта пина #{pin} для порта #{port}"
-
-	elsif type == "normal"
-		# define_method(var.to_sym) do
-		# 	instance_variable_get("@users__var__#{var}")
-		# 	end
-		# instance_variable_set("@users__var__#{var}" , UserOutput.new("#{var}", port: port, pin: pin, type: type))
-
-		eval ("
-			def #{var}
-				@users__var__#{var}
-			end
-			@users__var__#{var} = RubimCode::UserOutput.new(\"#{var}\", port: port, pin: pin, type: type)
-			")
+	elsif not mcu_class::PORTS.include? port.to_sym
+		RubimCode.perror "У микроконтроллера #{mcu_class::MCU_NAME} нет порта #{port}"
+	elsif not mcu_class::PORTS[port.to_sym].include? pin.to_i
+		RubimCode.perror "У микроконтроллера #{mcu_class::MCU_NAME} нет порта пина #{pin} для порта #{port}"
+	elsif not var.is_a? Symbol
+		RubimCode.perror "Unknown type of parameters for helper #{__method__}"
+	end
+
+	if type == "normal"
+		var_name = var.to_s.gsub(/^[@$]/, "")
+		if rb_type == 'output'
+			return RubimCode::UserOutput.new(var_name, port: port, pin: pin, type: type)
+		elsif rb_type == 'input'
+			return RubimCode::UserInput.new(var_name, port: port, pin: pin, type: type)
+		end
 
 	elsif type == "tri-state"
 		RubimCode.perror "В данный момент тип выхода 'z-state' не реализован"
@@ -27,8 +25,12 @@ def output (var, port: nil, pin: nil, type: "normal")
 	end
 end
 
-# ToDo: realize this method
+def output(var, port: nil, pin: nil)
+	RubimCode.init_io(self.class, 'output', var, port: port, pin: pin)
+end
+
 def input (var, port: nil, pin: nil)
+	RubimCode.init_io(self.class, 'input', var, port: port, pin: pin)
 end
 
 
@@ -39,28 +41,55 @@ class RubimCode
 		def rubim_tbit(var, bit); "#{var} ^= 1<<#{bit};"; end
 	end # class << self
 
-	class UserOutput
+	class UserIO
 		attr_accessor :name, :port, :pin, :type
 
 		def initialize(name, port: nil, pin: nil, type: "normal")
+			# ToDo: check type of params:
+			# name, port - only symbol
+			# pin - only UserVariable with type 'fixed' (feature: pin can receive also instance vars: @pin_num)
+			# type - only 'normal' (feature: realize 'tri-state' type)
 			@name = name.to_s
 			@port = port.to_s
-			@pin = pin.to_s
+			@pin = pin.name.to_s
 			@type = type.to_s
-			RubimCode.pout (RubimCode.rubim_sbit("DDR#{port}", "#{pin}"))
 		end
+	end # end UserIO class
+
+	class UserOutput < UserIO
+		def initialize(name, port: nil, pin: nil, type: "normal")
+			super
+			RubimCode.pout(RubimCode.rubim_sbit("DDR#{port}", "#{pin}") + " /* #{self.name} configure as output */ ")
+		end
+
 
 		def on
-			RubimCode.pout (RubimCode.rubim_sbit("PORT#{port}", "#{pin}"))
+			RubimCode.pout(RubimCode.rubim_sbit("PORT#{port}", "#{pin}") + " /*#{self.name}.#{__method__}*/")
 		end
 
 		def off
-			RubimCode.pout (RubimCode.rubim_cbit("PORT#{port}", "#{pin}"))
+			RubimCode.pout(RubimCode.rubim_cbit("PORT#{port}", "#{pin}") + " /*#{self.name}.#{__method__}*/")
 		end
 
 		def toggle
-			RubimCode.pout (RubimCode.rubim_tbit("PORT#{port}", "#{pin}"))
+			RubimCode.pout(RubimCode.rubim_tbit("PORT#{port}", "#{pin}") + " /*#{self.name}.#{__method__}*/")
 		end
-	end
+	end # end UserInput class
+
+	class UserInput < UserIO
+		def initialize(name, port: nil, pin: nil, type: "normal")
+			super
+			RubimCode.pout(RubimCode.rubim_cbit("DDR#{port}", "#{pin}") + " /* #{self.name} configure as output */ ")
+		end
+
+
+		def hi?
+			"bit_is_set(PORT#{port}, #{pin})" + " /*#{self.name}.#{__method__}*/"
+		end
+
+		def low?
+			"bit_is_clear(PORT#{port}, #{pin})" + " /*#{self.name}.#{__method__}*/"
+		end
+	end # end UserOutput class
 
-end # RubimCode class
+end # end RubimCode class

data/lib/rubimc/mcu/avr/attiny13.rb

@@ -8,7 +8,7 @@ class AVR_attiny13 < AVRController
 			true
 		end
 
-		def micro_layout 
+		def mcu_layout 
 			# ToDo: set F_CPU from user programm
 			RubimCode.pout "#define __AVR_ATtiny13__ 1" 
 			RubimCode.pout "#define F_CPU 1000000UL" # Microcontroller frequency (Hz)
@@ -56,19 +56,19 @@ class AVR_attiny13 < AVRController
 			refs0 = case options[:ref] # источник опорного напряжения
 						when "vcc" then 0
 						when "internal" then 1
-						else perror "Undefined value for option :ref in method '#{__method__}'"
+						else RubimCode.perror "Undefined value for option :ref in method '#{__method__}'"
 					end
 
 			adlar = case "right" # options[:result_adjust] # выравнивание результата вычислений всегда по правому краю
 						when "left" then 1
 						when "right" then 0
-						else perror "Undefined value for option :result_adjust in method '#{__method__}'"
+						else RubimCode.perror "Undefined value for option :result_adjust in method '#{__method__}'"
 					end
 
 			channel = options[:channel]
 			unless channel.in? [ADC0, ADC1, ADC2, ADC3]
 				RubimCode.pout channel
-				perror "Undefined value for option :channel in method '#{__method__}'"
+				RubimCode.perror "Undefined value for option :channel in method '#{__method__}'"
 			end
 
 			RubimCode.pout("ADMUX = (#{refs0}<<REFS0) | (#{adlar}<<ADLAR) | #{channel};")
@@ -77,7 +77,7 @@ class AVR_attiny13 < AVRController
 			adate = case options[:auto_triggering] # одиночное преобразование или множественное
 						when "enable" then 1
 						when "disable" then 0
-						else perror "Undefined value for option :auto_triggering in method '#{__method__}'"
+						else RubimCode.perror "Undefined value for option :auto_triggering in method '#{__method__}'"
 					end
 
 			# adif = ? # ToDo: ADC Interrupt Flag 
@@ -92,7 +92,7 @@ class AVR_attiny13 < AVRController
 						when 32 then 5
 						when 64 then 6
 						when 128 then 7
-						else perror "Undefined value for option :prescale in method '#{__method__}'"
+						else RubimCode.perror "Undefined value for option :prescale in method '#{__method__}'"
 					end
 
 			RubimCode.pout ("ADCSRA = (1<<ADEN) | (#{adate}<<ADATE) | (#{adps}<<ADPS0) | (#{adie}<<ADIE);")
@@ -106,7 +106,7 @@ class AVR_attiny13 < AVRController
 			# ToDo: должен возвращать значение, реализовать как С-функцию
 			# ToDo: можно использовать ленивую загрузку Ruby - autoload
 			unless channel.in? [ADC0, ADC1, ADC2, ADC3, nil]
-				perror "Undefined value for option :channel in method '#{__method__}'"
+				RubimCode.perror "Undefined value for option :channel in method '#{__method__}'"
 			end
 			
 			unless channel.nil?
@@ -127,15 +127,16 @@ class AVR_attiny13 < AVRController
 		end
 
 		def self.interrupt(**options, &block)
+
 			options.permit_and_default!(enabled: false)
 			# if is_enabled && block.nil? # ToDo: проверить на наличие блока если прерывание активно
 			# 	perror "method #{__method__} mast have a block"
 			# end
 
-			adie = case options[:enabled] # ADC Interrupt Enable
+			adie = case options[:enabled].to_bool # ADC Interrupt Enable
 						when true then 1
 						when false then 0
-						else perror "Undefined value for option :is_enabled in method '#{__method__}'"
+						else RubimCode.perror "Undefined value for option :enabled in method '#{__method__}'"
 					end
 			if adie == 0 # if interrupt disabled
 				RubimCode.pout "Start continuously ADC convert"
@@ -146,10 +147,10 @@ class AVR_attiny13 < AVRController
 				# RubimCode.pout ("sei();") # automatically set (is it?)
 			end
 			
-			# Genetare Interrupt code
+			# Generate Interrupt code
 			if block_given?
 				interrupt_code = "" # Write code in variable "interrupt_code"
-				RubimCode.pout_destination = interrupt_code
+				RubimCode::Printer.pout_destination = interrupt_code
 				old_level = RubimCode.level
 				RubimCode.level = 0
 
@@ -160,12 +161,15 @@ class AVR_attiny13 < AVRController
 					# ToDo - надо точно  разобраться с выравниванием 
 					# (see above in convert method)
 					RubimCode.pout "int __rubim__volt = ADCL + ((ADCH&0b11) << 8);"
-					yield (RubimCode::UserVariable.new("__rubim__volt", "int"))
+			        RubimCode::Isolator.outside_binding = block.binding
+			        RubimCode::Isolator.run
+					yield(RubimCode::UserVariable.new("__rubim__volt", "tmp_int"))
+			        RubimCode::Isolator.stop
 				RubimCode.level -= 1
 				RubimCode.pout ("}")
 
 				RubimCode.level = old_level
-				RubimCode.pout_destination = :default
+				RubimCode::Printer.pout_destination = :default
 				RubimCode::Interrupts.add(interrupt_code)
 			end
 		end # interrupt method
@@ -173,4 +177,5 @@ class AVR_attiny13 < AVRController
 	end # ANALOG_TO_DIGITAL Class 
 
 
-end # RubimCode class
+end # RubimCode class
+

data/lib/rubimc/mcu/avr/avr_controller.rb

@@ -1,16 +1,6 @@
 class AVRController < Controllers
 	MCU_SERIES = "AVR"
-
-	def self.print_layout(position)
-		if position == :before_main
-			print_cc_layout(:before_main) do 
-				micro_layout # prints includes for current microcontroller
-			end 
-		elsif position == :after_main
-			print_cc_layout(:after_main)
-		end
-	end
 end
 
-# ToDO: add all folder 'avr'
+# ToDo: add all folder 'avr'
 require 'rubimc/mcu/avr/attiny13'

data/lib/rubimc/preprocessor.rb

@@ -51,7 +51,7 @@ class RubimRipper
             if (ident.in? [:on_int, :on_float])
             	bug_plus = (symb[0]=="+" ? "+" : "")
             	# Note: space before "UserVariable" is neсessary
-            	source = replace_words(source, symb, "#{bug_plus} RubimCode::UserVariable.new(#{symb})", pos)
+            	source = replace_words(source, symb, "#{bug_plus} RubimCode::UserVariable.new(#{symb}, 'fixed')", pos)
             end
     	end
     	return source
@@ -127,18 +127,22 @@ class RubimRipper
     end
 
     def self.replace_boolean_kw(source)
-    	source = replace_keywords(source, "true", "UserVariable.new(true)")
-    	source = replace_keywords(source, "false", "UserVariable.new(false)")
+    	source = replace_keywords(source, "true", "RubimCode::UserVariable.new(true, 'fixed')")
+    	source = replace_keywords(source, "false", "RubimCode::UserVariable.new(false, 'fixed')")
     	return source
     end
 
     def self.add_binding_to_init(source) # for initialize variables with methods 'integer', 'float', e.t.
+		helpers_array = ["boolean", "bool", "integer", "int", "float", "double"]
+		helpers_array += ["string"]
+		helpers_array += ["output", "input"]
+
 		sexp = Ripper.sexp(source)
 		command_array = find_rec(sexp, :command)
 		command_array.reverse_each do |elem|
 			varies_name = []
 			symb, helper_name, helper_pos = elem[1]
-			if helper_name.in? ["integer", "float", "string"] # if one of helper methods
+			if helper_name.in? helpers_array # if one of helper methods
 				args_add_block = find_rec(elem, :args_add_block)[0][1]
 				args_add_block.each do |arg|
 					if arg[0] == :symbol_literal
@@ -157,6 +161,7 @@ class RubimRipper
 						raise ArgumentError.new("Wrong arguments for helper '#{helper_name}'") 
 					end
 				end
+				varies_name = [varies_name[0]] if helper_name.in? ['output', 'input']
 				var_str = varies_name.join(', ') # list of vars, defined in helper method
 				source = paste_before_pos(source, "#{var_str} = ", helper_pos) # paste vars before helper method
 			end
@@ -164,6 +169,12 @@ class RubimRipper
 		return source
     end
 
+    def self.replace_instructions(source)
+		source = replace_keywords(source, "next", "RubimCode.rubim_next")
+		source = replace_keywords(source, "break", "RubimCode.rubim_break")
+		return source
+    end
+
 	#########################
     # === PRIVATE SECTION ===
     #########################
@@ -232,7 +243,7 @@ class RubimRipper
 	        raise "can not find near position in array #{array}"
 	    end
 
-	    # Поиск позиции наиболее дальнего идентификатора справа
+	    # Поиск позиции наиболее дальнего идентификатора справа (рекурсивно)
 	    def self.find_far_pos(array)
 	        array.reverse_each do |el|
 	            if el.is_a? Array # если найден идентификатор, указывающий на позицию
@@ -288,10 +299,10 @@ class PreProcessor
 
 	def self.execute(str)
 		@@program = str
+		
+		# Последовательность очень важна - не нарушать!
 		@@program = RubimRipper.replace_assing_operators(@@program)
 		@@program = RubimRipper.replace_all_numeric(@@program)
-
-		# Последовательность очень важна - не нарушать!
 		@@program = RubimRipper.replace_then_else_elsif_kw(@@program)
 
 		@@program = RubimRipper.replace_modify_express(@@program, "if")
@@ -308,47 +319,15 @@ class PreProcessor
 		@@program = RubimRipper.replace_rubim_tmpif(@@program)
 
 		@@program = RubimRipper.add_binding_to_init(@@program)
-
-		# @@program = RubimRipper.replace_boolean_kw(@@program)
-
-
-		# See 
-		#  p defined?(x = 1) # => "assignment"
-		#  p defined?(x[5] = 1) # => "method"
-		#  p defined?(x[5] += 1) # => "method"
-
-		# --- OLD VERSION, BASED ON REGEXP ---
-		# убрать пробелы между всеми односимвольными операторами (кроме оператора ":")
-		# operators = "\\+\\-\\*\\/\\^\\!\\=\\~\\?\\:\\%\\|\\&"
-		# @@program.gsub!(/\ *?([#{operators}&&[^\:]])\ ?/, '\1')
-
-		# замена оператора "=" на ".c_assign=" (только перед переменными)
-		# ch = "a-zA-Z"
-		# @@program.gsub!(/(^|[^#{ch}\.])([#{ch}\d]+)=([^\=\~])/, '\1\2.c_assign=\3')
-
-		# замена всех цифр(Fixnum), после которых идут операторы, на UserVariable.new()
-		# @@program.gsub!(/(^|[^\w])([-+]?\d*\.?\d+)([#{operators}&&[^\=]])/, '\1UserVariable.new(\2)\3')
-		# замена всех цифр(Fixnum), после которых идет указание метода, на UserVariable.new()
-		# @@program.gsub!(/(^|[^\w])(\d+)(\.[\w&&[^\d]])/, '\1UserVariable.new(\2)\3')
+		@@program = RubimRipper.replace_instructions(@@program) # next/break
+		@@program = RubimRipper.replace_boolean_kw(@@program) # true/false
 	end 
 
 
 	# write preprocessing program in file
 	def self.write_in_file(input_file, dirname, basename, outfile)
-		# basename = File.basename(input_file)
-		# dirname = File.dirname(input_file)
-		# outfile = "#{dirname}/release"
-
-		# # clear directory "release"
-		# Dir.mkdir(outfile) unless Dir.exists?(outfile)
-		# Dir.foreach(outfile) do |file| 
-		# 	File.delete("#{outfile}/#{file}") if (file!='.' && file!='..')
-		# end
-		
 		PreProcessor.execute( File.read(input_file) )
 		File.write("#{outfile}", PreProcessor.program)
-
-		print "done\n"
 	end
 
 end

data/lib/rubimc/printer.rb

@@ -16,13 +16,11 @@ end
 
 class RubimCode
 class << self
-
 	attr_accessor :level
-	def level
-		@level = 0 if @level.nil?
-		@level
-	end
+end
+@level = 0
 
+class << self
 	def perror(error_message)
 		if error_message.nil? or error_message.to_s.nil? 
 			raise ArgumentError, "error message is not string" 
@@ -32,7 +30,7 @@ class << self
 		code_ptr = caller_locations(2)
 		code_ptr.each do |place| 
 			place = place.to_s
-			place.gsub!(/^release\/pre_/, '')
+			place.gsub!(/\/release\//, '/')
 			error_message += "\tfrom #{place}\n"
 		end
 		puts "#ERROR: #{error_message}"
@@ -47,31 +45,22 @@ class << self
 		else
 			@level = 0 if @level.nil?
 			res_str = " "*4*@level + str.to_s 
-			if (($pout_destination == :default) or ($pout_destination.nil?))
+			if RubimCode::Printer.pout_destination.in? [:default, nil]
 				puts res_str
 				unless defined? TEST_MODE
 					File.open("#{ARGV[0]}", 'a+') {|file| file.puts(res_str) }
 				end
+			elsif RubimCode::Printer.pout_destination == :h_file
+				unless defined? TEST_MODE
+					h_name = ARGV[0].gsub(/\.c$/, '') + ".h"
+					File.open("#{h_name}", 'a+') {|file| file.puts(res_str) }
+				end
 			else
-				$pout_destination.concat(res_str).concat("\n")
+				RubimCode::Printer.pout_destination.concat(res_str).concat("\n")
 			end
 		end
 	end
 
-	# ToDo: remove to RubimCode::Printer
-	$pout_destination = :default
-	def pout_destination=(dest)
-		if dest.nil?
-			perror "Wrong parameter for method #{__method__}. Set destination string"
-		end
-
-		if dest.class.name == "String" or dest == :default # dest.is_a? not work...WTF
-			$pout_destination = dest
-		else
-			perror "Wrong parameter for method #{__method__}. Only string variable or ':default' value is permit as a parameters"
-		end
-	end
-
 	def clear_c(str)
 		pout "// generate with clear_c function"
 		pout str
@@ -87,6 +76,27 @@ class RubimCode::Printer
 		attr_accessor :sandbox
 	end
 
+	@@instance_vars_cc = []
+	def self.instance_vars_cc
+		@@instance_vars_cc
+	end
+
+	@@pout_destination = :default
+	def self.pout_destination
+		@@pout_destination
+	end
+	def self.pout_destination=(dest)
+		if dest.nil?
+			perror "Wrong parameter for method #{__method__}. Set destination string"
+		end
+
+		if dest.class.name == "String" or dest.in? [:default, :h_file] # dest.is_a?(String) not work...WTF
+			@@pout_destination = dest
+		else
+			perror "Wrong parameter for method #{__method__}. Only string variable or ':default' value is permit as a parameters"
+		end
+	end
+
 	def self.code_type
 		if not Controllers.all.empty?
 			"avr-gcc" 
@@ -101,6 +111,41 @@ class RubimCode::Printer
 		code_type == "avr-gcc" ? Controllers.all.first::MCU_NAME : "undefined"
 	end
 
+	def self.print_layout(position, &mcu_layout)
+		return if RubimCode::Printer.sandbox == true # don`t print output in sandbox
+		h_name = File.basename(ARGV[0], '.c') + '.h'
+		if position == :before_main
+			RubimCode::Printer.pout_destination = :h_file
+			RubimCode.pout "/**************************************************************"
+			RubimCode.pout " * This code was generated by RubimC micro-framework"
+			RubimCode.pout " * Include file for \"#{ARGV[0]}\""
+			RubimCode.pout " **************************************************************/"
+
+			RubimCode::Printer.pout_destination = :default
+			RubimCode.pout "/**************************************************************"
+			RubimCode.pout " * This code was generated by RubimC micro-framework"
+			RubimCode.pout " * RubimC version: #{RubimCode::VERSION}"
+			RubimCode.pout " * RubimC author: Evgeny Danilov"
+			RubimCode.pout " * File created at #{Time.now}"
+			RubimCode.pout " **************************************************************/"
+			RubimCode.pout
+			RubimCode.pout "#include <stdbool.h>"
+			RubimCode.pout "#include <stdio.h>"
+			RubimCode.pout
+			yield if block_given? # print includes for current MCU (see mcu libraries)
+			RubimCode.pout
+			RubimCode.pout "#include \"#{h_name}\""
+			RubimCode.pout
+			RubimCode.pout "int main(int argc, char *argv[]) {"
+			RubimCode.level += 1
+		else
+			RubimCode.pout
+			RubimCode.pout "return 1;"
+			RubimCode.level -= 1
+			RubimCode.pout "}"
+		end
+	end
+
 	def self.print_main_loop
 		RubimCode.pout
 		RubimCode.pout "// === Main Infinite Loop === //"
@@ -111,25 +156,38 @@ class RubimCode::Printer
 		RubimCode.pout"} // end main loop"
 	end
 
+	def self.print_instance_vars
+		RubimCode::Printer.pout_destination = :h_file
+		@@instance_vars_cc.each do |var|
+			if var.is_a? RubimCode::UserVariable
+				RubimCode.pout "#{var.type} #{var.name};"
+			end
+		end
+		RubimCode::Printer.pout_destination = :default
+	end
+
 	def self.generate_cc
 		if Controllers.all.count > 1
 			RubimCode.perror "In current version in one file you can define only one Controller Class"
 		end
 
 		if self.code_type == "avr-gcc" # if compile program for MCU
-			Controllers.all.each do |controllerClass|
-				controllerClass.print_layout(:before_main)
-				controller = controllerClass.new # print initialize section
-				print_main_loop {controller.main_loop} # print body of main loop
-				controllerClass.print_layout(:after_main)
-				RubimCode::Interrupts.print
+			Controllers.all.each do |mcu_class|
+				print_layout(:before_main) do
+					mcu_class.mcu_layout if mcu_class.respond_to? :mcu_layout
+				end
+				mcu = mcu_class.new # print initialize section
+				print_main_loop {mcu.main_loop} # print body of main loop
+				print_layout(:after_main) 
+				RubimCode::Interrupts.print()
+				RubimCode::Printer.print_instance_vars()
 			end # each Controllers.all
 
-		elsif self.code_type == "gcc" # if compile clear-C program 
+		elsif self.code_type == "gcc" # if compile clear-C program
 			if Controllers.all.empty? and eval("self.private_methods.include? :main")
-				Controllers.print_cc_layout(:before_main)
-				eval("main(RubimCode::CC_ARGS.new)") # execute method :main (CC_ARGS - helper for C agruments argc/argv)
-				Controllers.print_cc_layout(:after_main)
+				print_layout(:before_main)
+				eval("main(RubimCode::CC_ARGS.new)") # execute user`s method :main (CC_ARGS - helper for C agruments argc/argv)
+				print_layout(:after_main)
 			end
 		end
 	end

data/lib/rubimc/ruby_classes.rb

@@ -16,7 +16,7 @@ class Object
 					else nil
 				end
 		if type.nil? or self.to_s.nil?
-			perror "Неизвестный тип переменной"
+			RubimCode.perror "Неизвестный тип переменной"
 		end
 		UserVariable.new(self.to_s, type)
 	end

data/lib/version.rb

@@ -1,3 +1,3 @@
 class RubimCode
-	VERSION = "0.2.1" 
+	VERSION = "0.2.2" 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubimc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Evgeny Danilov
@@ -53,8 +53,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: 'RubimC: Framework for MCU - 0.2.1'
+summary: 'RubimC: Framework for MCU - 0.2.2'
 test_files: []