vendor/rust/rust/function.rb in gecoder-0.7.1 vs vendor/rust/rust/function.rb in gecoder-0.8.0

@@ -115,11 +115,11 @@
       @name = params[:name]
       @bindname = params[:bindname]
       @parent = params[:parent]
       @optional_count = 0
 
-      @varname = "f#{@parent.varname}#{@name}"
+      @varname = "f#{@parent.varname}#{@name.gsub('::', '_').gsub(/[<>]/, '')}"
 
       @aliases = Set.new
       @variable = false # Variable arguments function
 
       @parameters = Array.new
@@ -137,10 +137,10 @@
       add_expansion 'function_aliases', '@aliases.collect { |alii| Templates["FunctionInitAlias"].gsub("!function_alias!", alii) }.join("\n")'
       add_expansion 'function_prototype', '@prototype_template'
       add_expansion 'function_parameters', 'ruby_parameters'
       add_expansion 'function_call', 'stub'
       add_expansion 'function_varname', 'varname'
-      add_expansion 'function_cname', '@name'
+      add_expansion 'function_cname', 'varname'
       add_expansion 'function_paramcount', 'paramcount'
       add_expansion 'function_bindname', '@bindname'
       add_expansion 'parent_varname', '@parent.varname'
     end