Description:
fixed compiler for c++
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r129:0d09bc291a32 - - 1 file changed: 1 inserted, 1 deleted
@@ -85,46 +85,46 | |||||
|
85 | forbidden_functions = ['system', 'fopen', 'freopen', 'open', 'remove', 'rename'] |
|
85 | forbidden_functions = ['system', 'fopen', 'freopen', 'open', 'remove', 'rename'] |
|
86 | redefine_list = [] |
|
86 | redefine_list = [] |
|
87 | forbidden_count = 0 |
|
87 | forbidden_count = 0 |
|
88 | forbidden_key = (rand(8999) + 1000).to_s |
|
88 | forbidden_key = (rand(8999) + 1000).to_s |
|
89 | forbidden_functions.each do |f| |
|
89 | forbidden_functions.each do |f| |
|
90 | redefine_list << "-D#{f}=forbidden#{forbidden_key}#{forbidden_count}" |
|
90 | redefine_list << "-D#{f}=forbidden#{forbidden_key}#{forbidden_count}" |
|
91 | forbidden_count += 1 |
|
91 | forbidden_count += 1 |
|
92 | end |
|
92 | end |
|
93 | redefine_str = redefine_list.join ' ' |
|
93 | redefine_str = redefine_list.join ' ' |
|
94 | puts redefine_str |
|
94 | puts redefine_str |
|
95 |
|
95 | ||
|
96 | # Compile. |
|
96 | # Compile. |
|
97 | case params[:prog_lang] |
|
97 | case params[:prog_lang] |
|
98 |
|
98 | ||
|
99 | when "c" |
|
99 | when "c" |
|
100 | command = "#{C_COMPILER} -E #{params[:source_file]} -o source_prep.c" |
|
100 | command = "#{C_COMPILER} -E #{params[:source_file]} -o source_prep.c" |
|
101 | system(command) |
|
101 | system(command) |
|
102 | command = "#{C_COMPILER} source_prep.c #{redefine_str} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
102 | command = "#{C_COMPILER} source_prep.c #{redefine_str} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
103 | puts command |
|
103 | puts command |
|
104 | system(command) |
|
104 | system(command) |
|
105 |
|
105 | ||
|
106 | when "c++" |
|
106 | when "c++" |
|
107 | command = "#{CPLUSPLUS_COMPILER} -E #{params[:source_file]} -o source_prep.cpp" |
|
107 | command = "#{CPLUSPLUS_COMPILER} -E #{params[:source_file]} -o source_prep.cpp" |
|
108 | system(command) |
|
108 | system(command) |
|
109 |
- command = "#{CPLUSPLUS_COMPILER} #{redefine_str} |
|
109 | + command = "#{CPLUSPLUS_COMPILER} #{redefine_str} source_prep.cpp -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
110 | system(command) |
|
110 | system(command) |
|
111 |
|
111 | ||
|
112 | when "pas" |
|
112 | when "pas" |
|
113 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
113 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
114 | system(command) |
|
114 | system(command) |
|
115 | FileUtils.mv("output", params[:output_file]) |
|
115 | FileUtils.mv("output", params[:output_file]) |
|
116 |
|
116 | ||
|
117 | else |
|
117 | else |
|
118 | talk("ERROR: Invalid language specified!") |
|
118 | talk("ERROR: Invalid language specified!") |
|
119 | open(params[:message_file],"w") do |f| |
|
119 | open(params[:message_file],"w") do |f| |
|
120 | f.puts "ERROR: Invalid language specified!" |
|
120 | f.puts "ERROR: Invalid language specified!" |
|
121 | end |
|
121 | end |
|
122 | exit(127) |
|
122 | exit(127) |
|
123 | end |
|
123 | end |
|
124 |
|
124 | ||
|
125 | # Report success or failure. |
|
125 | # Report success or failure. |
|
126 | if FileTest.exists? params[:output_file] |
|
126 | if FileTest.exists? params[:output_file] |
|
127 | talk "Compilation was successful!" |
|
127 | talk "Compilation was successful!" |
|
128 | else |
|
128 | else |
|
129 | talk "ERROR: Something was wrong during the compilation!" |
|
129 | talk "ERROR: Something was wrong during the compilation!" |
|
130 | end |
|
130 | end |
You need to be logged in to leave comments.
Login now